Updated to work with new Vundle