Ensure we're pinging server where appropriate

[DanielOaks]

We need to make sure we're pinging server and keeping track of ping timeouts so we can timeout our own connection and reconnect if we haven't gotten any data recently.