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)
Fix #777, improve tests, add cb_each
Change test to use CBL instead of Spamhaus (due to DNS blocking)
Merge pull request #778 from smfreegard/master

Fix #777, improve tests, add cb_each
dns_list_base: change tense of run_cb -> ran_cb
dnsbl: remove a little redundancy
Merge pull request #780 from msimerson/dns_list

dnsbl
config/*: mass adjustments
config/plugins: populate it
geoip: enable distance & too_far
headers: disable reject
config-plugins: back out karma.ini
config/plugins: replace mail_from.access and rcpt_to.access with access
config: remove spamexperts from mf.bl_re
change version, so it's advertised
disabled by default for proto_mismatch