Get rid of a full except; not tested yet
Merge pull request #40 from scraperwiki/do-not-catch-broadly

Get rid of a full except; not tested yet
Merge branch 'master' into fix-monitor-future

Conflicts:
	twsearch.py