Cleanup and ready for release of 2.2.0.