pep8
Merge branch 'master' of git://github.com/mozilla/build-buildbotcustom into pep8