Bring some changes from centos to vimrc

Bring in some changes from my CentOS vimrc to my main vimrc.
Merge branch 'master' into git