Update dependencies for new R10k module
Update Puppetfile

This update adds the recent version of R10k along with another
module, redis, that has a branch we can check out.
Merge branch 'master' into production

Conflicts:
	Puppetfile