2.2 final resubmission

This is the final 2.2 resubmission. There might be some grammatical
errors but I'm not overly fussed now. Maybe there'll be another commit
after this with similar message.

I also had some trickiness with Git. Four files I wan't aware that I
modified have been modified. Maybe I'm just forgetful.