match current state first, then event type.
Merge pull request #34 from mknoszlig/master

Problem: current clojure server reverses the state/event model  hierarchy