First pass at #266

Two forms, YAML validated by http://yamllint.com/