Update version numbers to 2.2.1 for next release.

It would likely be best to fix a few more main bugs and then do a small
update with fixes.