AWON and ASOS working for heartbeat
OK, working nicely for AWON, ASOS, Web apps, and ET
Merge branch 'heartbeat'
Getting rid of some lingering debug stuff