Fleshing out card typing. This also required some rejiggering of turn
phases to fix a naming collision.