Update vimrc
Merge in changes