minor fix and shortened heartbeat timeout
Merge branch 'heartbeat-proteins' of https://github.com/nickmasso/Greenduino into heartbeat-proteins