add sensible defaults to the timeout setting
Merge pull request #62 from mattkanwisher/master

Sensible defaults for timeouts