Merge branch 'master' into develop0.4
check to ensure response is HTML before adding comment
modify readme
tentatively fixed bug
fixes tests for this bug
Merge branch 'hotfix/pinho'
up the version
Merge branch 'master' into develop0.4

Conflicts:
	lib/upton.rb
	lib/upton/version.rb
fix up to match tests
Merge branch 'develop0.4' into future

Conflicts:
	lib/upton/scraper.rb
	lib/upton/version.rb
	spec/unit/pagination_spec.rb
Merge branch 'future' of github.com:propublica/upton into future

Conflicts:
	lib/upton/scraper.rb