Fixes #72 - good night sweet prince
Merge pull request #75 from aaronschachter/remove_custom_services

No more custom services