created decide_trump_r1 and r2, fixed up make_trump

decide_trump_r2 won't be called unless trump isn't decided in r1. added
a case in player_make_trump so if the dealer is forced to order up, they
do so for sure. added boolean condition in play_round to see if we need
to move on to decide trump in r2. code is untested.