Tidy up vimrc file a bit.