Some .vimrc tidying.