moving stuff out of code/control so things work on a production master
make it so syncing r10k is less miserable
getting rid of hiera config/puppet config chicken and egg riddle by using params instead
last of the provisioning
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Vagrantfile