add even moar Python 3.x compatibility hacks from the six project, update license