Vimrc tweaks.
Merge branch 'master' of https://github.com/twisty/dotfiles