Changed to a bit more dynamic. Fixed various syntax issues.
Merge pull request #1 from kaspernj/kj/dynamic_config_syntax_issues

Dynamic config