Minor change for Python-3 compatibility
Changing setup for python2/python3 compatibility
Actually use the version-checking code...
Merge for release 2013-1018