Updated puppet to use r10k for module provisioning, and shuffled module paths a little