Added the NRPE plugin to the plugin package list that's used for NRPE installs on Ubuntu 14.04.
do the simple puppet-lint errors
Merge branch 'develop' into puppet-lint

Conflicts:
	manifests/params.pp