Add yaml file support

Yaml is a super-set of json so allowing it allows for
configuration files with comments in it and for those
that prefer yaml they can use it.

Change-Id: I266dd990df9d0622cae4deb290e7c74ff1953f8b
Merge "Add yaml file support"