Improve Combo code

- No longer pass the card count to the combo() card definition method
- Rely on COMBO_ACTIVE rather than card count to check for combo
- Add a property for NUM_CARDS_PLAYED_THIS_TURN
- Add tests for Defias Ringleader