Tidy up vimrc a bit