Merge branch 'master' of github.com:berkmancenter/mediacloud
fix bugs in media_source_tags and media_sets fields
Merge branch 'master' into RELEASE_20140325