Update vimrc: Multiple changes w/ comments