Refactored vimrc and gvimrc; added a couple of new shortcuts