unstable 2.0

I know this is the master branch, but this really hasn't been published
to anybody so I'm fine with it. After 2.0 is stable, I'll start doing
feature branches