Add Template CPAN module to the list of direct dependencies as now it's being used by mediawords_generate_supervisord_conf.pl
Merge branch 'master' of github.com:berkmancenter/mediacloud
Add quotes around "$REPLY" so that the script doesn't take an empty input string as a "yes"
add media and stories lists to tag edit page; only show edit links for users with edit permissions;
Merge branch 'master' of github.com:berkmancenter/mediacloud