Updated YAML parse
Merge branch 'master' of https://github.com/argally/torgen