--- a/vim/vimrc	Sun Mar 13 15:48:31 2016 -0700
+++ b/vim/vimrc	Mon Mar 14 21:01:35 2016 -0700
@@ -42,14 +42,15 @@
 call add(g:pathogen_disabled, 'ragtag')
 call add(g:pathogen_disabled, 'interestingwords')
 
+" Load pathogen.
 " Potentially add the local bundle directory.
+let s:pathogen_bundles = ['bundle/{}']
 if isdirectory(s:vim_home.s:path_sep.'local')
-    execute 'set runtimepath+='.s:vim_home.s:path_sep.'local'
+    "execute 'set runtimepath+='.s:vim_home.s:path_sep.'local'
+    call add(s:pathogen_bundles, 'local/{}')
 endif
-
-" Load pathogen.
-"call pathogen#infect()
-call pathogen#runtime_append_all_bundles()
+call call('pathogen#infect', s:pathogen_bundles)
+"call pathogen#runtime_append_all_bundles()
 
 " Hide the toolbar in MacVim/gVIM, and set a nice window size.
 if has("gui_running") && !exists('g:resourcing_vimrc')
@@ -381,6 +382,7 @@
 augroup VimRCFileType_c
     au!
     autocmd FileType c,c++,cpp setlocal foldmethod=syntax
+    autocmd FileType c,c++,cpp setlocal colorcolumn=120
 augroup END
 
 augroup VimRCFileType_css
@@ -480,7 +482,7 @@
 nnoremap <C-l>s :call <SID>ToggleSpellCheck()<cr>
 
 " Simple way to close a buffer without closing the window.
-nnoremap <leader>bd :bprevious<cr>:bdelete #<cr>
+nnoremap <leader>d :bprevious<cr>:bdelete #<cr>
 
 " Use sane regexes.
 nnoremap / /\v