Bump version numbers for 2.1 release
Fix a test, update readme for 2.1 release