Moved to pathogen, with addons -> bundle using git submodules.

.gitmodules

@@ -1,3 +1,15 @@
 [submodule "addons/vim-fugitive"]
 	path = addons/vim-fugitive
 	url = http://github.com/tpope/vim-fugitive.git
+[submodule "bundle/snipmate"]
+	path = bundle/snipmate
+	url = http://github.com/msanders/snipmate.vim.git
+[submodule "bundle/nerdtree"]
+	path = bundle/nerdtree
+	url = http://github.com/scrooloose/nerdtree.git
+[submodule "bundle/fuzzyfinder"]
+	path = bundle/fuzzyfinder
+	url = http://github.com/clones/vim-fuzzyfinder.git
+[submodule "bundle/fugitive"]
+	path = bundle/fugitive
+	url = git://github.com/tpope/vim-fugitive.git

README

@@ -6,4 +6,20 @@ My .vimrc looks like this:
     " and then source the common configuration file
     source ~/.vim/vimrc
 
+All addons go in the bundle directory and are managed by
+pathogen. When possible I install them as git submodules:
+
+git submodule add http://github.com/msanders/snipmate.vim.git bundle/snipmate
+git submodule init
+git submodule add http://github.com/scrooloose/nerdtree.git bundle/nerdtree
+git submodule init
+git submodule add http://github.com/clones/vim-fuzzyfinder.git bundle/fuzzyfinder
+git submodule init
+git submodule add git://github.com/tpope/vim-fugitive.git bundle/fugitive
+git submodule init
+
+Add 'tags' to bundle/snipmate/.git/info/exclude
+and bundle/fuzzyfinder/.git/info/exclude
+so that when tags are regenerated, git doesn't think
+you have a dirty submodule.