Updated Errbit to latest

This maintains a clean history from upstream, so all of our custom commits are on top of their code. At some point, we probably should try and wrap up some of those commits into pull request to contribute back (or, if they're not suitable for pull requests, figure out a better way to stay up to date with upstream while maintaining our own customizations).

Let me know if this is the right approach.

P.S. This probably should *not* be merged in, but should instead replace master.