Merge pull request #11 from wrightmikea/dsl

fix typo
add preliminary Scenario dsl classes; refactor some feature classes
resolve conflicts