diff --git a/.gitmodules b/.gitmodules
index 9206ab7..faa4392 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "vim/bundle/autoclose"]
 	path = vim/bundle/autoclose
 	url = https://github.com/Townk/vim-autoclose.git
+[submodule "vim/bundle/snipmate"]
+	path = vim/bundle/snipmate
+	url = https://github.com/msanders/snipmate.vim.git
diff --git a/Rakefile b/Rakefile
index ef4df93..a005d94 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,6 +10,7 @@ task :install do
                    misc/ackrc
                    misc/inputrc
                    misc/nanorc
+                   mist/ctags
                    ruby/autotest/autotest
                    ruby/gemrc
                    ruby/irbrc
diff --git a/git/gitconfig b/git/gitconfig
index 2afce61..4c1988f 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -33,3 +33,17 @@
 	prompt = false
 [diff]
 	tool = Kaleidoscope
+[merge "bundlelock"]
+	name = lock Gemfile
+	driver = bundle install
+[merge "railsschema"]
+	name = newer Rails schema version
+	driver = "ruby -e '\n\
+		system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
+		b = File.read(%(%A))\n\
+		b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n>+ .*/) do\n\
+		  %(ActiveRecord::Schema.define(:version => #{[$1, $2].max}) do)\n\
+		end\n\
+		File.open(%(%A), %(w)) {|f| f.write(b)}\n\
+		exit 1 if b.include?(%(<)*%L)'"
+
diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate
new file mode 160000
index 0000000..f5a75d0
--- /dev/null
+++ b/vim/bundle/snipmate
@@ -0,0 +1 @@
+Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
diff --git a/vim/vimrc b/vim/vimrc
index 5d28e9e..17daab3 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,9 +1,14 @@
 " Pathogen setup
-filetype off
-call pathogen#runtime_append_all_bundles()
-filetype plugin indent on
+runtime! autoload/pathogen.vim
+if exists('g:loaded_pathogen')
+  filetype off
+
+  call pathogen#runtime_append_all_bundles(expand("~/.vim/bundle"))
+  call pathogen#helptags()
+endif
 
 syntax on
+filetype plugin indent on
 colorscheme railscasts
 
 set tabstop=2
@@ -54,3 +59,7 @@ set wildignore+=Transmission*Remote*GUI
 
 let g:ragtag_global_maps = 1 
 
+if filereadable(expand('~/.vimrc.local'))
+  source ~/.vimrc.local
+endif
+