Starting move back to python2
Lots of python3->2 changes