Completion of missed YAML updates
Merge pull request #62 from grutz/yamlfix

Completion of missed YAML updates