--- a/.hgsub	Fri Mar 07 15:56:32 2014 -0800
+++ b/.hgsub	Fri Mar 07 19:55:07 2014 -0800
@@ -21,6 +21,9 @@
 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/yankring = [git]https://github.com/vim-scripts/YankRing.vim.git
+vim/bundle/linediff = [git]https://github.com/AndrewRadev/linediff.vim.git
+vim/bundle/pythonmode = [git]https://github.com/klen/python-mode.git
 
 vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium
 vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust

--- a/.hgsubstate	Fri Mar 07 15:56:32 2014 -0800
+++ b/.hgsubstate	Fri Mar 07 19:55:07 2014 -0800
@@ -1,5 +1,5 @@
 f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths
-53423381c54045f2d6d9952ecb71916fb3878cd7 lib/hg/hg-git
+5e74edb7a62d726e9314d09a8ae48b0e3515d8f3 lib/hg/hg-git
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes
@@ -11,16 +11,19 @@
 33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
 a383a816d9759df14a8b964baaa5c321f18c69f1 vim/bundle/lawrencium
 5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less
+0ab83da0e11ca98ec0407b35c0a9e183f355616a vim/bundle/linediff
 61deff1362b5ea4c63eead77a52c51316fa7d433 vim/bundle/markdown
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
+5a7594f6e218dda3e13b123d406d1c2ae94d979b vim/bundle/pythonmode
 1a93cbb14f537c001a52a43b94309d6c625b5953 vim/bundle/ragtag
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-1852b5d386cdee4ba8aa8447e032e0bd01aaeef3 vim/bundle/syntastic
+ffe3085a804f6a668987af45ff5edf953ff2ff58 vim/bundle/syntastic
 dbc05b24a3da1541a211a2f6513777145258577a vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
+a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring

--- 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>