bugfix
Merge branch 'master' of github.com:agabert/onitsuka3-puppet

Conflicts:
	space/onitsuka3-puppet/etc/puppet/environments/development/puppet/modules/nagios3-configuration/manifests/nagios-nrpe-servers.pp