Tidy up chargen finalization

Reduce messiness and - IMPORTANTLY - make it so characters can't go unnamed ("yes, waste points" -> "I want to give a name" started the game without naming the char).
Restoring a conditional that got dropped by the last commit
Merge pull request #363 from ethankaminski/chargen-tidy

Tidy up chargen finalization