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