Update _config.yml
Merge branch 'master' into gh-pages