changing heartbeats to not send if other traffic is running, and made it a little more efficient on receives
Fix the format_time unit test again
Removed unused DEBIAN_V8_VERSION macro from src/Makefile because of "apt-cache: command not found" error when not on debian
Merge review 139 by @tryneus
Merge branch 'next' into sam_osxbuild