Move things around and fix activation for Vundle new version