tidied up vimrc