Merging both the .gvimrc and the .vimrc.

There's no real reason for there to be two seperate files.
So I'm merging them both.