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
line_socket: rename socket to 'socket' (was: self)
smtp_client: moved STATE_* vars into STATE object

and renamed self -> client (meaningful)
smtp_client: handle timeouts in a more robust way

set a default if whatever val arrives doesn't parseInt()
smtp_: more linear code
smtp_client: slight revision to get_client_plugin

pass it a config object, rather than a config file(ish) object. IOW, have
smtp_client and smtp_proxy pass in the 'main' section of their config file
instead of their entire config.
when rcpt_to.length===1 and more specific smtp

route is defined in smtp_forward.ini, forward the message to the more specific
smtp route.