Simplify modal statemachine (#149)
Simplify modal statemachine (#149)

Combine 'active' & 'submenu' states & fix a bug where the main menu
could be 're-entered' while transitioning to the submenu state
incorrectly.
agzam/spacehammer