diff --git a/.vimrc.bundles b/.vimrc.bundles
index 997ae9623..d855236bc 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -202,7 +202,7 @@
     " Python {
         if count(g:spf13_bundle_groups, 'python')
             " Pick either python-mode or pyflakes & pydoc
-            Bundle 'klen/python-mode'
+            Bundle 'python-mode/python-mode'
             Bundle 'yssource/python.vim'
             Bundle 'python_match.vim'
             Bundle 'pythoncomplete'
@@ -244,7 +244,7 @@
 
     " HTML {
         if count(g:spf13_bundle_groups, 'html')
-            Bundle 'amirh/HTML-AutoCloseTag'
+            Bundle 'alvan/vim-closetag'
             Bundle 'hail2u/vim-css3-syntax'
             Bundle 'gorodinskiy/vim-coloresque'
             Bundle 'tpope/vim-haml'
diff --git a/.vimrc.local b/.vimrc.local
new file mode 100644
index 000000000..060f6c2b7
--- /dev/null
+++ b/.vimrc.local
@@ -0,0 +1,4 @@
+:set mmp=5000
+:set nu
+
+Plugin 'fatih/vim-go'