Client timeout is now a 'total request' timeout

Previous behavior was for a 'quiet time' timeout. This seems more desirable.