Updated the changelog and base to begin collecting 2.1.1 changes