1.0
Merge branch 'production' of github.com:ns408/puppet-r10k into production

Conflicts:
	Puppetfile