Removed Vundle and tidied up .vimrc