cleaning up error vs. event distinction logic
Merge branch 'master' of https://github.com/emilydolson/HBSensorData