Tidied up and folded .vimrc