Prepare for new call back parameters
Various improvements

Added name of card a dice is rolled on to the output.
Added new parameters to onCardMove event.
Split the donate code so that the card controller is the only one to
manipulate the markers on the card.
Remove the spurious "and" as a trait choice in the askChoice dialog.
Shuffle in OCTGN is fixed

Stop using my local version as it is slower.
Changes to event parameters

Use None as it is safer.
Change to [] or{} depending on final implementation