--- a/vim/vimrc	Wed Nov 07 08:00:29 2012 -0800
+++ b/vim/vimrc	Tue Mar 05 20:32:12 2013 -0800
@@ -29,10 +29,16 @@
 " Get our vim directory. 
 let s:vim_home = expand("<sfile>:h")
 
+" Make sure `filetype` stuff is turned off before loading Pathogen.
+syntax off
+filetype off
+
 " Disable some plugins.
 let g:pathogen_disabled = []
 call add(g:pathogen_disabled, 'vimroom')
 call add(g:pathogen_disabled, 'minibufexpl')
+call add(g:pathogen_disabled, 'ragtag')
+call add(g:pathogen_disabled, 'fugitive')
 
 " Load pathogen.
 call pathogen#infect()
@@ -212,20 +218,24 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\.git$\|\.hg$\|\.svn$',
-  \ 'file': '\.exe$\|\.so$\|\.dll$'
+  \ 'dir':  '\.git$\|\.hg$\|\.svn$|\venv$',
+  \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
-" Open Hg! commands in a normal buffer.
-let g:lawrencium_hg_bang_edit_command = 'edit'
+" Use `pyflakes` with `syntastic`.
+let g:syntastic_python_checker = 'pyflakes'
 
+" Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
             \'clog': 'hggraphlog'
             \}
 
+" Make the annotate window better in Lawrencium.
+let g:lawrencium_annotate_width_offset = 0
+
 " }}}
 
 " File-Specific Settings {{{
@@ -291,7 +301,7 @@
 " Easier things to type
 nnoremap <leader>w :w<cr>
 nnoremap <leader>q :q<cr>
-nnoremap <leader>h :Hg 
+nnoremap <leader>hg :Hg 
 nnoremap <leader>hs :Hgstatus<cr>
 nnoremap <leader>hv :Hgvdiff<cr>
 
@@ -330,10 +340,7 @@
 
 " Quick search and replace.
 nnoremap <leader>s :%s/\<<C-r><C-w>\>//g<left><left>
-vnoremap <leader>s :s/<C-r>///g<left><left>
-
-" Quick Mercurial run.
-nnoremap <leader>h :Hg! 
+vnoremap <leader>s y:%s/<C-r>*//g<left><left>
 
 " }}}