Small fixes
Change dependency order
Update r10k to most recent version
Better provisioning of puppet master
Vagrant amendment for better provisioning
Small fix
Fix some setup issues