Fixed end turn handling. Fixes #463 (this does not handle Time Vault correctly. It needs a skip current turn effect that's not implemented yet).