Add local environment-specific fixes and configuration changes.
Add local-only changes.
Integrate both upstream and local changes.
Merge branch 'master' of https://github.com/boldandbusted/puppet-icinga

Conflicts:
	manifests/collect.pp
	manifests/config/server/redhat.pp
	manifests/plugins/checkping.pp
Revert "Merge branch 'master' of https://github.com/boldandbusted/puppet-icinga"

This reverts commit 3496d23b03d1d6508ba9c0f77853165567cc8634, reversing
changes made to 31c0f9231d32e303564e3a9c390557ad234534f8.
Add generic-contact.cfg
Whitespace, tabularize, and add needed generic-contact.cfg for server.