update config file templates
Merge branch 'master' into plugins