refactor(agent): Simplify agent heartbeat routine
Merge pull request #257 from bcwaldon/refactor-heartbeat

Simplify agent heartbeat routine