Merge branch 'master' of git.epichack.com:barak/dotfiles

.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"
@@ -188,6 +189,18 @@ let g:CommandTMaxDepth = 7
 au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
 au BufEnter *.org            call org#SetOrgFileType()
 
+" * Airline
+set noshowmode
+let g:airline_enable_branch = 1
+let g:airline_enable_syntastic = 1
+let g:airline_enable_tagbar = 1
+let g:airline_theme="ubaryd"
+
+" * CtrlP
+let g:ctrlp_map = ',t'
+let g:ctrlp_cmd = 'CtrlP'
+let g:ctrlp_working_path_mode = 'ra'
+
 
 " ** STATUSLINE **
 "
@@ -225,6 +238,10 @@ command ScratchOpen :e scp://barak@barakmich.com//home/barak/notes/scratch
 " Sudo-make-me-a-sandwich write. For when I forget to be root.
 command Wdammit :w !sudo tee > /dev/null %
 
+" I can never remember markdown fully. Open me a cheatsheet
+command MarkdownCheatsheet :rightb vsplit ~/.vim/markdown_cheatsheet.md
+
+
 " Doesn't quite work right but can be a real savior if needed.
 " Oh-shit-what-was-this-like-before-I-changed-it?
 function! s:DiffWithSaved()