move media_with_types below media_tags_map
Merge branch 'master' of https://github.com/berkmancenter/mediacloud

Conflicts:
	script/mediawords.sql