added heroku and moved supervisord
Merge branch 'develop'