time out on http requests that don't respond
Merge branch 'master' of github.com:casseveritt/r3