:|
Merge branch 'master' of https://github.com/pbhemphill/dotvim
edits to gvimrc
merge gvimrc