Fix bad rebase
Remove errant console.log
Fix a couple of bugs left over from rebase
Improved director
Add a token test so that all test suites emit the 'end' event even if there aren't actually any tests configured.