diff --git a/install/vim b/install/vim
index 6944459c..ca41667e 100755
--- a/install/vim
+++ b/install/vim
@@ -3,7 +3,7 @@
 # Installing macvim/compiling vim
 if is_mac && ! command_exists "mvim"; then
     echo-g "==> Installing macvim"
-    brew install macvim --with-cscope --override-system-vim
+    brew install macvim --devel --with-lua --override-system-vim
 elif is_deb && ! vim --version | grep "Compiled by $(whoami)@$(hostname)" 2>&1 >/dev/null; then
     echo-g "==> Preparing to compile vim from source"
     pkg-install libncurses5-dev libgnome2-dev libgnomeui-dev \
@@ -19,8 +19,9 @@ elif is_deb && ! vim --version | grep "Compiled by $(whoami)@$(hostname)" 2>&1 >
         --enable-rubyinterp \
         --enable-pythoninterp \
         --enable-perlinterp \
+        --enable-luainterp \
         --enable-gui=gtk2 --enable-cscope --prefix=/usr
-    make VIMRUNTIMEDIR=/usr/share/vim/vim73
+    make VIMRUNTIMEDIR=/usr/share/vim/vim74b
     sudo make install
     rm -rf ~/vim
 fi
@@ -40,13 +41,11 @@ if [ ! -e ~/.vimrc ]; then
     fi
 
     # Install vim from my distro: https://github.com/hlissner/mlvim
-    bash <(curl https://raw.github.com/hlissner/mlvim/master/install.sh -L)
+    bash <(curl https://raw.github.com/hlissner/vim/master/install.sh -L)
 else
     # Installing/updating vim bundles
     echo-g "==> Vim: Updating..."
-    find ~/.vim/bundle/ -type d -name .git \
-    | xargs -n 1 dirname \
-    | while read line; do cd $line && echo -n "* $(basename $line): " && git pull; done
+    vim +NeoBundleUpdate +qall
 fi
 
 echo-g "==> Vim: DONE!"