Integrate fixes into setup and build
2to3 is currently running only the default fixes. We need to get it running our own on the 2.6 code so any and all fixes we write can be run automatically. Individual fixes can be tested and resolved before fixing this, but this remains a priority issue.
Note: This is a sub-group three issue being resolved by the group.