Move to YAML and not json for most config files
Use .yml where applicable
Attempt to fix #28 again
Expand out statement