Better organization of ~/.vimrc
Move GUI config from ~/.gvimrc to ~/.vimrc

It's a bit easier to manage, and some of the GUI stuff had to be sourced
in ~/.vimrc instead of ~/.gvimrc, anyway.