fall cleaning, try #3

@cprice404 - I closed https://github.com/puppetlabs/trapperkeeper/pull/173 and opened this in its place.  Thanks a lot for reviewing - I'm glad that I was forced to think through the implications of those changes on the `services` namespace before they landed.