redesigned heartbeat and timeout system
Merge branch 'master' into new_timeouts
readability fixes
Merge pull request #3 from reinferio/new_timeouts

redesigned heartbeat and timeout system