Vundle support and minor tweaks