Permit overriding of default timeout
Bump version number
Merge pull request #22 from scraperwiki/timeouts

Permit overriding of default timeout