Handle merge conflicts

Sorry to respond so slowly to your work.  Here is a PR that brings you back up to master.

Notably I did remove the `from .versions import *` from `blaze.__init__`.  I see the version stuff as developer-facing rather than user-facing and I try to keep those things outside of the main namespace.