* Add hiera_config parameter
Merge branch 'add_hiera_config_parameter'

Conflicts:
	manifests/init.pp
	manifests/params.pp
	spec/classes/puppet_config_spec.rb