NY: combine the two events scrapers
Increase timeout for news fetch
Merge branch 'master' of github.com:sunlightlabs/openstates