Merge pull request pivotalforks#18 from pivotalcommon/switch-to-vundle

Switch to vundle

.gitignore

@@ -1,3 +1,5 @@
 .netrwhist
 doc/tags
 .vimlog
+bundle/*
+!bundle/vundle

.gitmodules

@@ -1,207 +1,5 @@
-[submodule "bundle/vim-vividchalk"]
-	path = bundle/vim-vividchalk
-	url = git://github.com/tpope/vim-vividchalk.git
+[submodule "bundle/vundle"]
+	path = bundle/vundle
+	url = https://github.com/gmarik/vundle.git
 	ignore = dirty
-[submodule "bundle/molokai"]
-	path = bundle/molokai
-	url = git://github.com/vim-scripts/molokai.git
-	ignore = dirty
-[submodule "bundle/vim-rails"]
-	path = bundle/vim-rails
-	url = git://github.com/tpope/vim-rails.git
-	ignore = dirty
-[submodule "bundle/vim-cucumber"]
-	path = bundle/vim-cucumber
-	url = git://github.com/tpope/vim-cucumber.git
-	ignore = dirty
-[submodule "bundle/vim-haml"]
-	path = bundle/vim-haml
-	url = git://github.com/tpope/vim-haml.git
-	ignore = dirty
-[submodule "bundle/vim-endwise"]
-	path = bundle/vim-endwise
-	url = git://github.com/tpope/vim-endwise.git
-	ignore = dirty
-[submodule "bundle/vim-surround"]
-	path = bundle/vim-surround
-	url = git://github.com/tpope/vim-surround.git
-	ignore = dirty
-[submodule "bundle/vim-repeat"]
-	path = bundle/vim-repeat
-	url = git://github.com/tpope/vim-repeat.git
-	ignore = dirty
-[submodule "bundle/nerdtree"]
-	path = bundle/nerdtree
-	url = git://github.com/scrooloose/nerdtree.git
-	ignore = dirty
-[submodule "bundle/nerdcommenter"]
-	path = bundle/nerdcommenter
-	url = git://github.com/scrooloose/nerdcommenter.git
-	ignore = dirty
-[submodule "bundle/ack.vim"]
-	path = bundle/ack.vim
-	url = https://github.com/mileszs/ack.vim.git
-	ignore = dirty
-[submodule "bundle/vim-abolish"]
-	path = bundle/vim-abolish
-	url = https://github.com/tpope/vim-abolish.git
-	ignore = dirty
-[submodule "bundle/vim-git-pair"]
-	path = bundle/vim-git-pair
-	url = https://github.com/Peeja/vim-git-pair.git
-[submodule "bundle/vim-javascript"]
-	path = bundle/vim-javascript
-	url = https://github.com/pangloss/vim-javascript.git
-	ignore = dirty
-[submodule "bundle/vim-colors-solarized"]
-	path = bundle/vim-colors-solarized
-	url = git://github.com/altercation/vim-colors-solarized.git
-	ignore = dirty
-[submodule "bundle/vim-fugitive"]
-	path = bundle/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive.git
-	ignore = dirty
-[submodule "bundle/vim-markdown"]
-	path = bundle/vim-markdown
-	url = https://github.com/plasticboy/vim-markdown.git
-	ignore = dirty
-[submodule "bundle/vim-ruby-refactoring"]
-	path = bundle/vim-ruby-refactoring
-	url = https://github.com/ecomba/vim-ruby-refactoring.git
-	ignore = dirty
-[submodule "bundle/vim-textobj-rubyblock"]
-	path = bundle/vim-textobj-rubyblock
-	url = https://github.com/nelstrom/vim-textobj-rubyblock.git
-	ignore = dirty
-[submodule "bundle/vim-textobj-user"]
-	path = bundle/vim-textobj-user
-	url = https://github.com/kana/vim-textobj-user.git
-	ignore = dirty
-[submodule "bundle/vim-unimpaired"]
-	path = bundle/vim-unimpaired
-	url = https://github.com/tpope/vim-unimpaired.git
-	ignore = dirty
-[submodule "bundle/vim-irblack"]
-	path = bundle/vim-irblack
-	url = https://github.com/wgibbs/vim-irblack.git
-	ignore = dirty
-[submodule "bundle/vim-ruby"]
-	path = bundle/vim-ruby
-	url = git://github.com/vim-ruby/vim-ruby.git
-	ignore = dirty
-[submodule "bundle/vim-slim"]
-	path = bundle/vim-slim
-	url = git://github.com/slim-template/vim-slim.git
-[submodule "bundle/gundo"]
-	path = bundle/gundo
-	url = https://github.com/sjl/gundo.vim.git
-[submodule "bundle/tabular"]
-	path = bundle/tabular
-	url = https://github.com/godlygeek/tabular
-[submodule "bundle/cucumbertables/ftplugin"]
-	path = bundle/cucumbertables/ftplugin
-	url = git://gist.github.com/1486660.git
-[submodule "bundle/syntastic"]
-	path = bundle/syntastic
-	url = git://github.com/scrooloose/syntastic.git
-[submodule "bundle/handlebars"]
-	path = bundle/handlebars
-	url = git://github.com/nono/vim-handlebars.git
-[submodule "bundle/tmux-config"]
-	path = bundle/tmux-config
-	url = git://github.com/pivotal/tmux-config.git
-[submodule "bundle/vim-tomorrow-theme"]
-	path = bundle/vim-tomorrow-theme
-	url = https://github.com/chriskempson/vim-tomorrow-theme.git
-[submodule "bundle/ag.vim"]
-	path = bundle/ag.vim
-	url = https://github.com/epmatsw/ag.vim.git
-[submodule "bundle/vim-coffee-script"]
-	path = bundle/vim-coffee-script
-	url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "bundle/hammer.vim"]
-	path = bundle/hammer.vim
-	url = https://github.com/matthias-guenther/hammer.vim.git
-[submodule "bundle/vim-colors-candycode"]
-	path = bundle/vim-colors-candycode
-	url = https://github.com/vim-scripts/candycode.vim.git
-[submodule "bundle/vim-colors-sampler"]
-	path = bundle/vim-colors-sampler
-	url = https://github.com/vim-scripts/Color-Sampler-Pack.git
-[submodule "bundle/enhancedjumps"]
-	path = bundle/enhancedjumps
-	url = https://github.com/vim-scripts/EnhancedJumps.git
-[submodule "bundle/test_server"]
-	path = bundle/test_server
-	url = https://github.com/brysgo/test_server.git
-[submodule "bundle/diffthese"]
-	path = bundle/diffthese
-	url = https://github.com/matt-royal/diffthese.git
-[submodule "bundle/vim-powerline"]
-	path = bundle/vim-powerline
-	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule "bundle/supertab"]
-	path = bundle/supertab
-	url = git://github.com/ervandew/supertab.git
-[submodule "bundle/mustache"]
-	path = bundle/mustache
-	url = git://github.com/juvenn/mustache.vim.git
-[submodule "bundle/vim-cucumber-align-pipes"]
-	path = bundle/vim-cucumber-align-pipes
-	url = git://github.com/quentindecock/vim-cucumber-align-pipes.git
-[submodule "bundle/j-split"]
-	path = bundle/j-split
-	url = git://github.com/mgamba/j-split.git
-[submodule "bundle/ZoomWin"]
-	path = bundle/ZoomWin
-	url = https://github.com/vim-scripts/ZoomWin.git
-[submodule "bundle/vim-blockle"]
-	path = bundle/vim-blockle
-	url = git://github.com/jgdavey/vim-blockle.git
-[submodule "bundle/camelcasemotion"]
-	path = bundle/camelcasemotion
-	url = https://github.com/vim-scripts/camelcasemotion.git
-[submodule "bundle/vim-gitgutter"]
-	path = bundle/vim-gitgutter
-	url = https://github.com/airblade/vim-gitgutter.git
-[submodule "bundle/tagbar"]
-	path = bundle/tagbar
-	url = https://github.com/majutsushi/tagbar.git
-[submodule "bundle/edit-plus"]
-	path = bundle/edit-plus
-	url = https://github.com/mgamba/edit-plus.git
-[submodule "bundle/colorschemes"]
-	path = bundle/colorschemes
-	url = https://github.com/flazz/vim-colorschemes.git
-[submodule "bundle/vim-qargs"]
-	path = bundle/vim-qargs
-	url = https://github.com/henrik/vim-qargs.git
-[submodule "bundle/quickfixfix"]
-	path = bundle/quickfixfix
-	url = https://github.com/brysgo/quickfixfix.git
-[submodule "bundle/vim-golang"]
-	path = bundle/vim-golang
-	url = https://github.com/jnwhiteh/vim-golang.git
-[submodule "bundle/vim-scala"]
-	path = bundle/vim-scala
-	url = https://github.com/rosstimson/scala-vim-support.git
-[submodule "bundle/ctrlp"]
-	path = bundle/ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
-	ignore = dirty
-[submodule "bundle/matcher"]
-	path = bundle/matcher
-	url = https://github.com/burke/matcher
-	ignore = dirty
-[submodule "bundle/vim-dispatch"]
-	path = bundle/vim-dispatch
-	url = https://github.com/tpope/vim-dispatch
-[submodule "bundle/vim-easymotion"]
-	path = bundle/vim-easymotion
-	url = https://github.com/Lokaltog/vim-easymotion.git
-[submodule "bundle/vim-clojure-static"]
-	path = bundle/vim-clojure-static
-	url = https://github.com/guns/vim-clojure-static.git
-[submodule "bundle/csv.vim"]
-	path = bundle/csv.vim
-	url = https://github.com/chrisbra/csv.vim.git
+	branch = master

README.md

@@ -5,24 +5,32 @@
     cd ~/.vim
     git submodule update --init
     ln -s ~/.vim/vimrc ~/.vimrc
+    vim +BundleInstall +qall
 
 # tmux support (optional)
-If you will be using VIM with tmux for remote pairing or window management, 
+
+If you will be using VIM with tmux for remote pairing or window management,
 see the README at [https://github.com/pivotal/tmux-config](https://github.com/pivotal/tmux-config)
 
-# Compile command-t matcher for CtrlP
+# Custom "command-t" matcher for CtrlP
+
+We use a custom matcher for CtrlP that makes it act similarly to CommandT. Run the following to install it.
 
     cd ~/.vim/bundle/matcher
-    make && sudo make install
+    make && make install # or sudo make install if necessary
+
+If you find yourself needing sudo, you might want to change the ownership of your /usr/local directory to the current user (for single-user machines only):
+
+    sudo chown -R $USER:admin /usr/local
 
 # Updating
-As long as your checkout is kept clean, you can easily update, rebase your local changes and update submodules with:
+
+First, fetch the latest vim-config via Git. You can also rebase or merge your own project-specific customizations.
+
+Then make sure the right version of Vundle is installed:
 
     cd ~/.vim && git pull --rebase && git submodule sync && git submodule update; cd -
-
-## Bumping plugin versions to latest
-Git submodule update will give you the checked in versions for all the plugins, you can bump up the versions with:
 
-    git submodule foreach git co master && git pull
-    
-You can also commit the bumped versions and submit a pull request if you'd like.
+To install/upgrade the necessary bundles:
+
+    vim +BundleInstall +qall # or run :BundleInstall within Vim