cleanup templates.
Merge pull request #25 from mozilla-services/dev

Dev
marketplace/nginx: add redirect_blocklist.conf to test blockist 301.
marketplace/nginx: update redirect to use server_names instead of redirect_names.
base: add hputils class.
base: merge nrpe plugins hiera array.
audit: let yum do its thing
audit: import changes from infra puppet.
audit: remove rhel.pp
audit: lint
marketplace/nginx: update redirect_blocklist.conf.