First pass at fixing the s3 client TimeoutConnections problem.
Merge pull request #236 from jasobrown/1.1

First pass at fixing the s3 client TimeoutConnections problem. Incorporating @johaho's fix from https://github.com/Netflix/Priam/pull/220. 

reviewed by @sagarl