Changed surrender logic so that it does not skip game phases

http://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/124

Fixes #657.