From f533ed97ce8a711586c3d128e8ecea5502c8aa3c Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sat, 24 Aug 2013 15:13:54 -0400
Subject: [PATCH] revert filetype

---
 .gitmodules             |  3 +++
 .vim/bundle/vim-airline |  1 +
 .vim/filetype.vim       | 24 +++++++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)
 create mode 160000 .vim/bundle/vim-airline

diff --git a/.gitmodules b/.gitmodules
index 51acc82..e20f15d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -70,3 +70,6 @@
 [submodule ".vim/bundle/vim-gocode"]
 	path = .vim/bundle/vim-gocode
 	url = https://github.com/Blackrush/vim-gocode.git
+[submodule ".vim/bundle/vim-airline"]
+	path = .vim/bundle/vim-airline
+	url = https://github.com/bling/vim-airline
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
new file mode 160000
index 0000000..8f04015
--- /dev/null
+++ b/.vim/bundle/vim-airline
@@ -0,0 +1 @@
+Subproject commit 8f0401580bae2ccf00d23d2f89c8db564e5260fe
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index c0962c5..f60b5ab 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -45,19 +45,17 @@ au BufRead,BufNewFile *.go set filetype=go
 
 
 "Settings per filetype
-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 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
 "augroup javascript
   "autocmd FileType javascript set ts=4
   "autocmd FileType javascript set softtabstop=4