Better deck management.

This commit should redraw any time you've drawn a card which has been discarded or is in play. Also the discard phase should be a bit better.