Better vundle support