renamed services.conf to services.config
Merge branch 'develop' of github.com:p-js/services into develop