(maint) Clean up the configuration a bit
Merge pull request #19 from puppetlabs-operations/confclean

(maint) Clean up the configuration a bit