Merge changes from annotate-bosh-error-tests

This gets the useful stuff from PR #44 which weren't merged before.