diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index f347885..b46aa00 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit f347885555b8446953c1c936830e85275b99ddfd
+Subproject commit b46aa009fd2660178d7d4bd49d2ea47a7ff530b9
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
index f165e8b..48208d4 160000
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit f165e8b4a2cf002e8d425808dab1568e57b66ec1
+Subproject commit 48208d46f84eae9e08b41bb9b41b15bc60aac6ef
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
index ff031d0..1511325 160000
--- a/.vim/bundle/vim-gitgutter
+++ b/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit ff031d022f2123353bc93a3aa97290287c10a287
+Subproject commit 15113259bbd85174ce865187cf872afc7c9c22d1
diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired
index 48d1cb6..0b4d112 160000
--- a/.vim/bundle/vim-unimpaired
+++ b/.vim/bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit 48d1cb6bf0000159291014226d8d8d3330ad875e
+Subproject commit 0b4d1123e727bc4b1a416d835c6995591f0f33b1
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index c50ce9b..c0962c5 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -45,17 +45,19 @@ au BufRead,BufNewFile *.go set filetype=go
 
 
 "Settings per filetype
-"augroup python
-  ""autocmd FileType python set omnifunc=pythoncomplete#Complete
-  ""autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
-  ""autocmd FileType python set completeopt-=preview
-  "autocmd FileType python set ts=4
-  "autocmd FileType python set softtabstop=4
-  "autocmd FileType python set shiftwidth=4
-  "autocmd FileType python set expandtab
-  "autocmd FileType python set nosmartindent
-  "autocmd FileType python let b:auto_trim_whitespace=1
-"augroup END
+if g:UseGooglePythonSettings == 0
+  augroup python
+    ""autocmd FileType python set omnifunc=pythoncomplete#Complete
+    ""autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
+    ""autocmd FileType python set completeopt-=preview
+    autocmd FileType python set ts=4
+    autocmd FileType python set softtabstop=4
+    autocmd FileType python set shiftwidth=4
+    autocmd FileType python set expandtab
+    autocmd FileType python set nosmartindent
+    "autocmd FileType python let b:auto_trim_whitespace=1
+  augroup END
+endif
 "augroup javascript
   "autocmd FileType javascript set ts=4
   "autocmd FileType javascript set softtabstop=4
diff --git a/.vimrc b/.vimrc
index 8cb0509..8f9753d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -123,6 +123,7 @@ setlocal cursorline
 let python_highlight_all = 1
 let g:Tb_MaxSize=0
 let g:Tb_MapCTabSwitchBufs = 1
+let g:UseGooglePythonSettings = 0
 
 " * Configure browser for haskell_doc.vim
 let g:haddock_browser = "open"