tidied up vimrc, and a few changes