Changes for deform2

This is *not* actually a pull request  — more of an FYI.

I've started hacking things up to work with `deform2`, the development branch of deform.