Bump version to 2.1.0, update CHANGELOG