Bring in some vimrc changes from main branch

Bring in some more changes from my main vimrc file into the centosvm
version.