Change yml to yaml
Remove spurious trailing whitespace.
Make the YAML examples be canonical.