Set keepAlive attribute on socket to help prevent stale stream connections.
Merge branch 'develop' of github.com:ninjablocks/client into develop