Use native decorator syntax in pkg_resources
Bumped to 2.1 in preparation for next release.
Added tag 2.1 for changeset c49c651997eb
Bumped to 2.2 in preparation for next release.
Correct RST syntax
Merge