py3 install: fixing version number
Merge branch 'master' into fix_version_number_py3

Conflicts:
	obspy/core/util/version.py
Cleaning up version.py encoding issues.
Fixing previous commit
Some more small modifications
Merge pull request #797 from megies/fix_version_number_py3

fixing version number on py3.x