Merge branch 'release/0.2.0'
Updated the trove classifiers.
Merge branch 'hotfix/0.2.1' into develop

Conflicts:
	setup.py