cleaned up the event logging code
missed removing a forward declaration
Merge branch 'master' into more-game-logic
Merge branch 'master' into more-game-logic
Merge branch 'more-game-logic'