Add configurable timeout to client.
Merge pull request #38 from calmofthestorm/configurable_timeout

Add configurable timeout to client.