Use annotated tags instead of lightweight tags
v0.2.1 Merge branch 'fix-pypi-travis-deploy'
Update CHANGES.md and version for v0.2.1