Merge pull request #85 from wshafer/master

Initial clean up of service managers
Merge remote-tracking branch 'upstream/master'