Clean .vimrc up a bit more