Merge branch 'master' of https://github.com/berkmancenter/mediacloud
always set solr_query_run to 't' when creating a controversy
Merge branch 'master' into RELEASE_20140325