Just a general maintenance commit

Lots of changes to the vimrc as well...