Added a __version__, changed setup.py accordingly.
Merge branch 'release-0.7.1'