--- a/vim/vimrc	Fri Mar 07 15:56:32 2014 -0800
+++ b/vim/vimrc	Fri Mar 07 19:55:07 2014 -0800
@@ -213,6 +213,8 @@
 
 " Plugin Settings {{{
 
+" Ctrl-P {{{
+
 " We'll set our own mappings.
 let g:ctrlp_map = ''
 
@@ -227,8 +229,19 @@
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
+" }}}
+
+" Syntastic {{{
+
 " Use `pyflakes` with `syntastic`.
 let g:syntastic_python_checkers = ['pyflakes']
+let g:syntastic_mode_map = {
+            \'mode': 'active',
+            \'passive_filetypes': []}
+
+" }}}
+
+" Lawrencium {{{
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
@@ -240,6 +253,28 @@
 
 " }}}
 
+" Gundo {{{
+
+let g:gundo_map_move_older = '<Down>'
+let g:gundo_map_move_newer = '<Up>'
+
+" }}}
+
+" YankRing {{{
+
+let g:yankring_replace_n_pkey = '<C-K>'
+let g:yankring_replace_p_pkey = '<C-J>'
+
+" }}}
+
+" Python-Mode {{{
+
+let g:pymode = 0
+
+" }}}
+
+" }}}
+
 " File-Specific Settings {{{
 
 if has("autocmd")
@@ -279,9 +314,9 @@
 noremap <home> g<home>
 noremap <end> g<end>
 
-" Buffer navigation
-noremap <C-Tab>   :bnext<cr>
-noremap <C-S-Tab> :bprevious<cr>
+" Tab navigation
+noremap <C-Tab>   :tabnext<cr>
+noremap <C-S-Tab> :tabprevious<cr>
 
 " Window navigation
 nnoremap <C-up> :wincmd k<cr>
@@ -295,6 +330,9 @@
 " Switch buffers.
 nnoremap <F3> :execute ("buffer " . bufname("#"))<cr>
 
+" Gundo.
+nnoremap <F5> :GundoToggle<cr>
+
 " Tagbar.
 nnoremap <F8> :TagbarToggle<cr>