Updated vundle and readme
fix merge conflicts