Updated for newer releases of Vundle