Change Bundle word to Plugin to match latest Vundle API
Misc updates