fix socket.timeout retry

[thehesiod]

resolves #494

[theacodes]

I would actually like a separate branch for socket.timeout, e.g.:

try:
    ...
except ...:
except socket.timeout as socket_timeout:
    ...
except socket.error as socket_error:
    ...
...

Also, would you mind adding a test to cover this case?

[thehesiod]

ok updated, I think I can change the existing tests as there is no mention of TimeoutError being thrown for sockets, instead even for python2 socket.timeout is what it should be: https://docs.python.org/2/library/socket.html#socket.timeout

[theacodes]

@thehesiod if you rebase, #496 should fix the test failure.