change supervisord.conf to use template fed by mediawords.yml
Merge branch 'master' of github.com:berkmancenter/mediacloud