Tidy up of .vimrc