Merged .vimrc and .gvimrc.

Now only the Windows specfic stuff is different in .gvimrc.