Lots of changes.
Trying to tidy up .vimrc