diff --git a/.vimrc b/.vimrc
index 7bb6e33..427ea0d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,11 +1,6 @@
 " Modeline and Notes {
 " vim: set sw=4 ts=4 sts=4 et tw=78 foldmarker={,} nofoldenable foldmethod=marker spell:
-"
-"   This is Nachuan's personal vim config fork from 
-"   spf13/spf13-vim (http://spf13.com)
-
 " Environment {
-
     " The default leader is '\', but many people prefer ',' as it's in a standard
     let mapleader = ','
     let maplocalleader = '_'
diff --git a/.vimrc.bundles b/.vimrc.bundles
index af9378b..43f7ecb 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -1,8 +1,10 @@
-
 " Environment {
 
     " Basics {
-        set nocompatible        " Must be first line
+    set nocompatible        " Must be first line
+
+    " So we don't need to put it inside autoload
+    source ~/.dotfiles/autoload/plug.vim
     " }
 " }
 
@@ -81,7 +83,7 @@
         if isdirectory(expand(plugin_dir . "/nerdtree"))
             let g:NERDShutUp=1
             nnoremap <C-e> :NERDTreeToggle<CR>
-            nmap <leader>nt :NERDTreeFind<CR>
+            nmap <leader>e :NERDTreeFind<CR>
 
             let NERDTreeShowBookmarks=1
             "let NERDTreeIgnore=['\.py[cd]$', '\~$', '\.swo$', '\.swp$', '^\.git$', '^\.hg$', '^\.svn$', '\.bzr$']
diff --git a/install.sh b/install.sh
index 095a953..22c5c5c 100755
--- a/install.sh
+++ b/install.sh
@@ -97,16 +97,12 @@ sync_repo() {
     fi
 }
 
-setup_vundle() {
+setup_vimplug() {
 
     # setup for vim 
-    curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
+    curl -fLo $APP_PATH/autoload/plug.vim --create-dirs \
         https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim > /dev/null 2>&1
 
-    # setup for neovim
-    #sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
-    #   https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-
     local system_shell="$SHELL"
     export SHELL='/bin/sh'
 
@@ -117,7 +113,7 @@ setup_vundle() {
         "+qall"
 
     export SHELL="$system_shell"
-    success "Now updating/installing plugins using Vundle"
+    success "Now updating/installing plugins using vim-plug"
 }
 
 set_up_nvim() {
@@ -165,7 +161,7 @@ set_up_vim() {
 
     success "Setting up vim symlinks."
 
-    setup_vundle
+    setup_vimplug
     set_up_nvim
 }