Change version to 2.2-pre

Change version number and date to be post-2.1.
Fix a few minor typos.