Added some more small enhancements, SCM versioning, and pypi autodeploy from master to test warehouse.