put keepalive back
Merge branch 'master' of https://github.com/jdehlin/Twitta