Adding basic Yaml to/from support.
Updated options for YAML/JSON to reduce confusion.