Install Devel::NYTProf with "--verbose" option to see why it fails on Travis
Force the install of Devel::NYTProf because the unit test "t/70-subname.t" fails with Sub::Name 0.07 (see https://github.com/timbunce/devel-nytprof/issues/34)
Re-add "--verbose" so we'll know when the tests stop failing
Merge branch 'travis-devel_nytprof'
Travis CI added Perl 5.20 support (https://github.com/travis-ci/travis-ci/issues/2428), so start testing on it
add cm_spider_iterations to config to replace NUM_SPIDER_ITERATIONS constant in CM::Mine
add description of how to find api key
add mc_spider_iterations
add controversy editing; add controvesy date editing; add batch media type editing; fix broken confirmatino dialog for remove stories button
fix support for adding dates by an increment
Merge branch 'master' of https://github.com/berkmancenter/mediacloud
move media_with_media_types view after tags creation
Get rid of "push / values / keys on reference is experimental" warnings
Move "CREATE VIEW media_with_media_types" statement even lower, after "CREATE TABLE media_tags_map" table; move "CREATE VIEW controversies_with_dates" statement lower, after "CREATE TABLE controversy_dates"
move media_with_types below media_tags_map
Merge branch 'master' of https://github.com/berkmancenter/mediacloud

Conflicts:
	script/mediawords.sql
move solr search message to template
fix #! line; make robust to content fetch errors
Merge branch 'travis-perl_5_20'
Remove checking for obsolete configuration syntax because most users must have their configuration updated by now