Merge tag 'sparks-2.1' into develop

2.1
More friendliness to the user about `env.repository`.
typo.
bump version in setup.py
Merge branch 'release/2.1.1'