Get to the new python. Added six and some backwards-compatiable fixes