Streamline timeout code.
Merge pull request #17 from cbracken/future-timeout

Streamline timeout code.