Bug 1021726 — set the heartbeat timeout
Merge pull request #109 from mozilla-services/bug1021726/heartbeat-timeout

Bug 1021726 — set the heartbeat timeout