Now doing keepalive on server connections.
Merge branch 'master' of https://github.com/johnmarkschofield/ocd