Update and tidy up vimrc