diff --git a/.gitmodules b/.gitmodules
index 296e922..fd64824 100644
--- a/.gitmodules
+++ b/.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
diff --git a/bundle/snipmate b/bundle/snipmate
new file mode 160000
index 0000000..f5a75d0
--- /dev/null
+++ b/bundle/snipmate
@@ -0,0 +1 @@
+Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
diff --git a/bundle/surround b/bundle/surround
new file mode 160000
index 0000000..6f0984a
--- /dev/null
+++ b/bundle/surround
@@ -0,0 +1 @@
+Subproject commit 6f0984a5ca1430047fe760fc680c6cf98ae94b01
diff --git a/vimrc b/vimrc
index ec60e5e..d31a8e5 100644
--- a/vimrc
+++ b/vimrc
@@ -30,6 +30,10 @@ nnoremap k gk
 imap jj <Esc>
 
 "Autoexit to normal mode
-au CursorHoldI * stopinsert
-au InsertEnter * let updaterestore=&updatetime | set updatetime=15000
-au InsertLeave * let &updatetime=updaterestore
+if has("autocmd")
+	au CursorHoldI * stopinsert
+	au InsertEnter * let updaterestore=&updatetime | set updatetime=15000
+	au InsertLeave * let &updatetime=updaterestore
+endif
+
+set autoread		"automatically reload files