Clean up vundle packages and add a couple