Fixed up the setup.py file to support py2 and py3