Merged master config

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "bundle/vim-erlang"]
 	path = bundle/vim-erlang
 	url = git://github.com/jimenezrick/vimerl.git
+[submodule "bundle/surround"]
+	path = bundle/surround
+	url = git://github.com/tpope/vim-surround.git
+[submodule "bundle/snipmate"]
+	path = bundle/snipmate
+	url = git://github.com/msanders/snipmate.vim.git