Bring in some vimrc changes from main branch

Bring in some changes from my main vimrc file into the centosvm version,
and tidy up the commenting for commands in the centosvm version that I
want to keep.