Update .vimrc.
Merge branch 'caberc' of github.com:caberson/dotfiles into caberc