Start working on making the codebase compatible between Python 2.7 and 3
This may have broken code in Python 2.7 due to from __future__ import...