'Buildbot' has only one capital 'B'

Plus some other minor cleanup.