Some hiera entries are optional now
Merge branch 'master' of https://github.com/flaf/shinken-puppet

Conflicts:
	shinken2/manifests/server.pp