Small cleanup of vimrc and gvimrc