Pypi add classifiers

Brings in changes from #156 — Updates to latest and compares against `develop`