Okay.  Can't really merge this until it's pointed at the PyPI version.  If we can use the PyPI version and workaround any import issues inside the `compat` module that'd be great.