merge vimrc and gvimrc with updates from work