More changes to a bunch of files to make them work after the refactor. All tests now run as far as I can tell. This counts as a success.
Merge branch 'master' of https://github.com/sfalkens/Clue-Player-