Update to new Vundle style