Merge license changes + pytox rename