remove hiera
Merge branch 'master' of git.puppet.immerda.ch:module-iodine

Conflicts:
	manifests/server.pp