Clean stuff up
ran 2to3-3.2
py3 update