change license classifier to pypi accepted value
Merge branch 'master' into dev

Unfortunate commits to the wrong branch, no big deal.