Good trading

Adds in Tokens for goods, and fixes rules for turns ending when making placements. Barter does not work properly still, and accounting for tokens/inventory is incomplete.