Sixfix

Looks like some of the six stuff broke python 2 compat - this gets tests running on both 3 and 2 for me