Merge vundle.vim back into vimrc

Not necessary anymore now that bootstrapping works.