bump to next patch version number
cleaning up
Merge branch 'master' into conda-package-resource