Merge pull request #13 from ljwolford/cleanup

Cleanup
Update supervisord.conf
fixed conflict