Py3 support without py25

All of the Py3 support changes updated to remove Python 2.5 support and its ugliness