Now enforcing timeouts in the server
Merge pull request #115 from square/jeversmann/timeout_enforcer

Now enforcing timeouts in the server