Log messages removed -- production version

Now additional log messages used for testing will not show during the
game.
Merge branch 'master' into pi-force
Draft code for witch

Code written for witch, and refactored doppeldrunk code to actually
switch roles (which is necessary for witch to work)