change supervisord.conf to use template fed by mediawords.yml
Merge branch 'master' of github.com:berkmancenter/mediacloud
ignore autocreated supervisord.conf
add russia controversy queries
add edit pages for tags and tag sets