From fe6571e1e44a5e6a4bdfc66f8f77ab1bede42efa Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Sat, 28 Dec 2013 10:58:48 -0600
Subject: [PATCH] Reorg bundles, add vim-vinegar and vim-grubox alternate
 colorscheme

---
 README.md       |  5 +++--
 vim/vundles.vim | 28 ++++++++++++++++++----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 97bdd1f..11c290a 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,9 @@ of plugins above to learn more.
  * `,jF` factories
  * `Cmd-Shift-P` - Clear CtrlP cache
  * `:Bopen [gem name]` to navigate to a gem (@tpope/vim-bundler)
+ * `Cmd-Shift-N` - NERDTree toggle
+ * `Ctrl-\` - Show current file in NERDTree
+ * `-` open the nerdtree in the current split, rather than popping out a project drawer (uses vim-vingar)
 
 #### Better keystrokes for common editing commands
 
@@ -227,8 +230,6 @@ of plugins above to learn more.
  * `ss` - horizontal split (`Ctrl-w,s`)
  * `,qo` - open quickfix window (this is where output from GitGrep goes)
  * `,qc` - close quickfix
- * `Cmd-Shift-N` - NERDTree toggle
- * `Ctrl-\` - Show current file in NERDTree
 
 #### Utility
 
diff --git a/vim/vundles.vim b/vim/vundles.vim
index fe03c70..9ed49ef 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -52,22 +52,18 @@ Bundle "wavded/vim-stylus"
 " Git related...
 Bundle "gregsexton/gitv"
 Bundle "mattn/gist-vim"
-Bundle "skwp/vim-git-grep-rails-partial"
-Bundle "tjennings/git-grep-vim"
 Bundle "tpope/vim-fugitive"
 Bundle "tpope/vim-git"
 
 " General text editing improvements...
 Bundle "AndrewRadev/splitjoin.vim"
 Bundle "Raimondi/delimitMate"
-Bundle "Shougo/neocomplcache.git"
+Bundle "Shougo/neocomplete.git"
 Bundle "briandoll/change-inside-surroundings.vim.git"
 Bundle "godlygeek/tabular"
-Bundle "nelstrom/vim-visual-star-search"
 Bundle "skwp/vim-easymotion"
 Bundle "tomtom/tcomment_vim.git"
 Bundle "tpope/vim-bundler"
-Bundle "vim-scripts/IndexedSearch"
 Bundle "vim-scripts/camelcasemotion.git"
 Bundle "vim-scripts/matchit.zip.git"
 Bundle "terryma/vim-multiple-cursors"
@@ -77,21 +73,29 @@ Bundle "terryma/vim-multiple-cursors"
 Bundle "garbas/vim-snipmate.git"
 Bundle "honza/vim-snippets"
 
+"File Navigation / Project Management
+Bundle "jistr/vim-nerdtree-tabs.git"
+Bundle "scrooloose/nerdtree.git"
+Bundle "kien/ctrlp.vim"
+Bundle "tpope/vim-vinegar"
+
+"Search
+Bundle "rking/ag.vim"
+Bundle "skwp/vim-git-grep-rails-partial"
+Bundle "tjennings/git-grep-vim"
+Bundle "vim-scripts/IndexedSearch"
+Bundle "nelstrom/vim-visual-star-search"
+
 " General vim improvements
 Bundle "chrisbra/NrrwRgn"
 Bundle "MarcWeber/vim-addon-mw-utils.git"
 Bundle "bogado/file-line.git"
-Bundle "jistr/vim-nerdtree-tabs.git"
-Bundle "kien/ctrlp.vim"
 Bundle "majutsushi/tagbar.git"
 Bundle "mattn/webapi-vim.git"
-Bundle "rking/ag.vim"
-Bundle "scrooloose/nerdtree.git"
 Bundle "scrooloose/syntastic.git"
 Bundle "sjl/gundo.vim"
 Bundle "skwp/YankRing.vim"
 Bundle "skwp/greplace.vim"
-Bundle "skwp/vim-conque"
 Bundle "tomtom/tlib_vim.git"
 Bundle "tpope/vim-abolish"
 Bundle "tpope/vim-endwise.git"
@@ -105,6 +109,8 @@ Bundle "vim-scripts/lastpos.vim"
 Bundle "vim-scripts/sudo.vim"
 Bundle "xsunsmile/showmarks.git"
 Bundle "terryma/vim-multiple-cursors"
+
+" Session Management
 "vim-misc is required for vim-session
 Bundle "xolox/vim-misc"
 Bundle "xolox/vim-session"
@@ -130,6 +136,8 @@ Bundle "bling/vim-airline.git"
 Bundle "vim-scripts/TagHighlight.git"
 Bundle "bogado/file-line.git"
 Bundle "jby/tmux.vim.git"
+Bundle "morhetz/gruvbox"
+
 
 " Customization
 " The plugins listed in ~/.vim/.vundles.local will be added here to