Fix #2735 pep8 > 1.4.6 has more errors
Merge mmartalo/buildbot:2735 (PR #1137)

+autopep8 (?!)
Ignore E123 since it's ignored in nine