Merge in the v2 branch

It's really past time that "v2" was merged back into master--nothing in the current master branch is ever going to be used again, and if I'm wrong, one can always go back to one of the old versions (that's the beautiful thing about git).