Do not merge branches with different codebase/project
Merge branch 'multiple-projects' of https://github.com/jollyroger/buildbot

+autopep8