Bump version to 2.1.0-SNAPSHOT, in preparation for George's updates