Solving conflict
Revert part of last commit, one is commented out code for debuging, the other is changes to supervisord template that should have been done in supervisord.conf, not the .tmpl (cevered in README.txt)
supervisord.conf was generated relative to assembl/scripts/ini_files.py instead of supervisord.conf.tmpl
Update README.txt
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into api_uses_uri
those files are hard to kill