code cleanup
Merge branch 'publish' of github.com:opentechinstitute/commotion-service-manager into publish