Update the README
Attempt to fix the "use set method" error when updating
Update the ancillary files
Update the CHANGELOG and README
No way this was gonna work...
Merge branch '2.2/develop' into 2.2/master