Ignore setup.cfg file from now on.
Resolve version from git tag.

Version tagging is now done from git-describe.
Add __gitsha__ variable to the version.py script.
Remove trailing blanks from the results.

And also from the afflicted source file.  It is better if line ends
with what it seems to be ending in.
Use basestring instead of str for type check.

This avoids spurious errors when variable name is of unicode type.
Also removed trailing spaces and unnecessary blank lines from the
affected source files.
Remove "g" prefix from the __gitsha__ value.
Merge branch 'develop'