Get rid of Timeout#timeout
Fix up tests from feedback
Merge pull request #29 from Shopify/get_rid_of_timeout

Get rid of Timeout#timeout