Merge branch 'master' into RELEASE_20140325
Merge branch 'RELEASE_20140325' of https://github.com/berkmancenter/mediacloud into RELEASE_20140325