Run cleanup based on heartbeat
 - Cleanup runs based on heartbeat, rather than client pings.
Merge pull request #47 from marcfallowsbb/cleanup

Run cleanup based on heartbeat