buildbot: 31c3 edition, now properly deals with branches