Working on recovery again
Merge branch 'master' of https://github.com/liangvic/ChunkyMonkeys into travis23
Working on the hearbeat
On heartbeat stuff
Fixing merge conflicts in the scheduler