Allow local customizations to gvimrc as well as vimrc
Merge remote branch 'upstream/master'