Add erb parsing to config yaml
Merge branch 'erb-yaml' into develop