Ignore everything in vim/tmp

Conflicts:
	.gitmodules

.gitignore

@@ -1,6 +1,4 @@
 vim/autoload
 vim/view
 vim/.netrwhist
-vim/tmp/backup/*
-vim/tmp/swap/*
-vim/tmp/undo/*
+vim/tmp/*

.gitmodules

@@ -26,10 +26,6 @@
   path = vim/bundle/syntastic
   url = https://github.com/scrooloose/syntastic.git
   ignore = dirty
-[submodule "vim/bundle/UltiSnips"]
-  path = vim/bundle/UltiSnips
-  url = https://github.com/vim-scripts/UltiSnips.git
-  ignore = dirty
 [submodule "vim/bundle/vim-easytags"]
   path = vim/bundle/vim-easytags
   url = https://github.com/xolox/vim-easytags.git
@@ -86,11 +82,27 @@
   path = vim/bundle/vim-coffee-script
   url = https://github.com/kchmck/vim-coffee-script.git
   ignore = dirty
-[submodule "vim/bundle/vim-snippets"]
-	path = vim/bundle/vim-snippets
-	url = https://github.com/honza/vim-snippets.git
-  ignore = dirty
 [submodule "vim/bundle/ack.vim"]
-	path = vim/bundle/ack.vim
-	url = https://github.com/mileszs/ack.vim.git
+  path = vim/bundle/ack.vim
+  url = https://github.com/mileszs/ack.vim.git
+  ignore = dirty
+[submodule "vim/bundle/vim-bundler"]
+  path = vim/bundle/vim-bundler
+  url = https://github.com/tpope/vim-bundler.git
+  ignore = dirty
+[submodule "vim/bundle/vim-cucumber"]
+  path = vim/bundle/vim-cucumber
+  url = https://github.com/tpope/vim-cucumber.git
+  ignore = dirty
+[submodule "vim/bundle/dbext.vim"]
+  path = vim/bundle/dbext.vim
+  url = https://github.com/vim-scripts/dbext.vim.git
+  ignore = dirty
+[submodule "vim/bundle/tabular"]
+  path = vim/bundle/tabular
+  url = https://github.com/godlygeek/tabular.git
+  ignore = dirty
+[submodule "vim/bundle/vim-rspec"]
+  path = vim/bundle/vim-rspec
+  url = https://github.com/thoughtbot/vim-rspec.git
   ignore = dirty