Merge github.com:neillturner/puppet_roles_hiera_parameters

Conflicts:
	README.md