(Hopefully) finished up PopUpState machine

Commencing testing
Ignore winning score if it is not being used
Removed win conditions flags

We already convey that we are not using time to end the game
by passing a negative value, and the same goes for score.
Having an additional flag on top of that adds nothing.
Wired up pop up state machine to main loop
Merge remote-tracking branch 'github/master'