Trivial tidy
Added optional yaml parsing, all test json templates are yaml compliant
fix merge conflict during merge of yamlsupport branch