Notify puppetdb service on init config change
Remove some lingering copy/paste garbage
Fix some weird merge stuff.  Restore original functionality
Merge branch 'master' of github.com:buckle/puppetlabs-puppetdb