Altered the combo state machine to take button keypresses.
See Mermaid.__init__ for examples of combo adding, plus comments.
Merge branch 'master' of github.com:rhanak/merwar
Fixed our combos to be what Tanya wanted (almost)