Update _config.yml
Merge vesh' changes
Merge saidlike's changes