A bit about YAML in the README
Merge branch 'master' into heroku