Merged changes from .gvimrc over to .vimrc.