Complete move to vundle