Merge pull request #20 from brentspector/master

Separate state machine files for Brent and Damien