add preliminary Scenario dsl classes; refactor some feature classes
resolve conflicts
Merge pull request #12 from wrightmikea/dsl

Dsl