docs and more tests
fixing merge
Merge branch 'master' of github.com:jtushman/state_machine