Issue 2547 [FIXED]

This was a rather small issue, but i took the liberty of taking this opportunity to move the management of buildslaves into the buildslavemanager. This is my first patch so i would appreciate any feedback if possible.
This TODO can go away, too!