AverageScorer renamed; should work and pass tests
Merge branch 'master' of https://github.com/SeanTater/watson