EX-135 (cgates): Fix broken test in merge2; minor method renaming in merge2; broad PEP8 cleanup; removed stray test output files