Make timeouts better.

[Thiefyface]

So, --timeout with --dont_kill is great and all, but the polling timeout needs to be different from the dropping connection timeout. Also, make it so dont_kill actually works correctly all the time (looking at you, websockets).