Add configurable timeout to client
Merge pull request #70 from groupon/davidw/clientTimeout

Add configurable timeout to client