First part of second attempt at porting
* 2to3
* six 1.3
* Sample code works in python 2 and 3
* Tests not updated