Undo my previous "fix" of button state logic
Merge branch 'master' of https://github.com/FlamingLotusGirls/TympaniButtonLimiter
Fix long overflow in calculating timeOn; change how time accumulates