Remove jumphost for bootstrap, remove debuggging
Rearrange hieradata so vagrant stuff doesn't run on real boxes