Update vimrc
Merge from github