Consolidate gvimrc and vimrc