first pass edits
Merge pull request #279 from basho/errors-update-jbs

first pass edits