Modified Puppetfile for production r10k repo
Added drupal module to poduction branch
Making sure all files synchronized, and we have nice parallel dev
in the Puppetfile going forward.

There is a single unique Puppetfile per environment, and I am
synchronizing to ensure everything is up to date and moving forward.
r10k installer
Merge branch 'master' into production

Conflicts:
	Puppetfile