Minor overhaul of buildbot naming, windows builder whooo!