Changed version numbering again.

Also setup.py now gets git info via a library instead of process calls,
and uploading a release to PyPI adds an appropriate git tag.