Switch to vundle and clean up vimrc