Merge branch 'develop'

I guess some people would call this a prerelease.
Most of the mechanisms are there, and I'm already using the code for
production, so we're very close to 1.0.
I still have a couple of easy todo items to touch before that.