Merge remote-tracking branch 'origin' into json2sql
Merge remote-tracking branch 'origin' into errors
more verbose error output
Merge pull request #23 from mozkeeler/errors

more verbose error reporting (fixes #16)