Tidying up vimrc