Update vimrc.
Merge branch 'master' of github.com:erichmenge/dotfiles