Merge gvimrc and vimrc, remove gvimrc

Simpler is always better
Update submodule for fonts