Cleanup changelog, bump next version to 2.2