Allow DSL class to be specified in config
reflect changes
Merge branch 'shumphrey/dsl-in-config-setting'