--- a/.hgsub	Mon Feb 17 10:33:04 2014 -0800
+++ b/.hgsub	Mon Feb 17 19:34:26 2014 -0800
@@ -19,6 +19,8 @@
 vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive.git
 vim/bundle/syntastic = [git]https://github.com/scrooloose/syntastic.git
 vim/bundle/less = [git]https://github.com/groenewege/vim-less.git
+vim/bundle/twig = [git]https://github.com/beyondwords/vim-twig.git
+vim/bundle/tagbar = [git]https://github.com/majutsushi/tagbar.git
 
 vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium
 vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust

--- a/.hgsubstate	Mon Feb 17 10:33:04 2014 -0800
+++ b/.hgsubstate	Mon Feb 17 19:34:26 2014 -0800
@@ -15,10 +15,12 @@
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-a90b2b60454fabe9a969d00b5d7f8d752ab61bd4 vim/bundle/ragtag
+1a93cbb14f537c001a52a43b94309d6c625b5953 vim/bundle/ragtag
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-ffe3085a804f6a668987af45ff5edf953ff2ff58 vim/bundle/syntastic
+1852b5d386cdee4ba8aa8447e032e0bd01aaeef3 vim/bundle/syntastic
+dbc05b24a3da1541a211a2f6513777145258577a vim/bundle/tagbar
+869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/stop_git_bullshit.sh	Mon Feb 17 19:34:26 2014 -0800
@@ -0,0 +1,3 @@
+#!/bin/sh
+hg onsub -t git "git reset --hard origin/master"
+

--- a/vim/vimrc	Mon Feb 17 10:33:04 2014 -0800
+++ b/vim/vimrc	Mon Feb 17 19:34:26 2014 -0800
@@ -221,14 +221,14 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build|node_modules)$'
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build|static|node_modules)$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
 " Use `pyflakes` with `syntastic`.
-let g:syntastic_python_checkers = ['pyflakes', 'pylint']
+let g:syntastic_python_checkers = ['pyflakes']
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
@@ -259,6 +259,12 @@
 
     augroup END
 
+    augroup VimRCTrailingWhitespaces
+        au!
+
+        autocmd FileType c,cpp,java,php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
+    augroup END       
+
 endif
 
 " }}}
@@ -289,6 +295,9 @@
 " Switch buffers.
 nnoremap <F3> :execute ("buffer " . bufname("#"))<cr>
 
+" Tagbar.
+nnoremap <F8> :TagbarToggle<cr>
+
 " Common typos.
 nnoremap ; :
 
@@ -408,6 +417,14 @@
     endif
 endfunction
 
+function! s:StripTrailingWhitespaces() abort
+    let l = line(".")
+    let c = col(".")
+    %s/\s\+$//e
+    let @/=''
+    call cursor(l, c)
+endfunction
+
 " }}}
 
 " Temporary stuff {{{
@@ -416,6 +433,9 @@
 let g:lawrencium_debug = 1
 let g:lawrencium_trace = 0
 
+command! LawrenciumEnableTrace  :call lawrencium#debugtrace(1)
+command! LawrenciumDisableTrace :call lawrencium#debugtrace(0)
+
 " Enable debugging PieCrust
 let g:piecrust_debug = 1
 let g:piecrust_trace = 0

--- a/vimperatorrc	Mon Feb 17 10:33:04 2014 -0800
+++ b/vimperatorrc	Mon Feb 17 19:34:26 2014 -0800
@@ -39,6 +39,9 @@
 " Quickly hide search highlighting
 nnoremap <leader><Space> :noh<cr>
 
+" Quickly open some dialogs
+nnoremap <leader>b :downloads<cr>
+
 " Super minimal UI
 set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs