Set higher timeouts + handle forwarder timeouts + instrument
Merge pull request #29 from wajam/clement-handle-forwarder-timeouts

Set higher timeouts + handle forwarder timeouts + instrument