diff --git a/.vimrc b/.vimrc
index a25eebd..b4861c3 100755
--- a/.vimrc
+++ b/.vimrc
@@ -166,6 +166,8 @@ nmap <Leader>/g /[<=>]\{7,}.*$<CR>
 " Toggle wrapping of long lines
 nmap <Leader>l :set wrap!<CR>
 
+" Strip trailing whitespace
+nmap <Leader><space> :TrailWhitespace <CR>
 " Scroll window while keeping cursor on same line with shift
 nmap <S-j> <c-e>
 nmap <S-k> <c-y>
@@ -175,4 +177,5 @@ vmap <S-k> <c-y>
 " Misc.
 map <Leader>n :noh<CR>
 vmap <Leader>T :'<,'> Tabularize /
+nnoremap <leader>c :execute "set colorcolumn=" . (&colorcolumn == "" ? "120" : "")<CR>
 noremap <space> :