Make _config.yml more generic
Merge branch 'hotfix/updates'