Add support for .yaml and allow .json and .yaml files to override other files
Merge branch 'master' of git://github.com/baudehlo/Haraka
Fix typo in hook_data_post respond function
Merge branch 'master' of git://github.com/baudehlo/Haraka
Merge branch 'master' of git://github.com/baudehlo/Haraka
Merge branch 'master' of github.com:smfreegard/Haraka
Document JSON/YAML changes
Merge pull request #753 from smfreegard/master

Configuration improvements (see comments)