Fixes typo in setup.py
Implements better git version scheme

Now with fallback to a RELEASE-VERSION file for
source tarballs.
Merge branch 'develop'