diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 8271848..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/.vim/syntax/nvpscript.vim b/.vim/syntax/nvpscript.vim
index 990886d..a19e65d 100644
--- a/.vim/syntax/nvpscript.vim
+++ b/.vim/syntax/nvpscript.vim
@@ -1,6 +1,6 @@
 " Vim syn file
 " Language:	NVISION Script	
-" Maintainer:	John Cook <john.cook@kla-tencor.com>
+" Maintainer:	Barak Michener
 " Last Change:	2006 Jun 29
 
 " For version 5.x: Clear all syntax items
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"