Version bump and changelog for 2.2.1