Bumping version to ensure that what is on pypi matches a tagged release, as prior to this 0.2.2 release, releases were not tagged
Merging from master