Change hierarchy, add hiera-gpg config.
Merge remote-tracking branch 'origin/master'

Conflicts:
	hiera.yaml