refactoring a few states. timer now reset in almost all states. Simpler to calculate when state change is due.
refactoring a few states. timer now reset in almost all states. Simpler to calculate when state change is due.

daveshed/LifeTester,daveshed/LifeTester,daveshed/LifeTester