* Fix for base cards printing with expansions
* Allow base set and base cards in expansions
This changes the existing behavior to allow both the printing of the base set as well as printing base cards with expansions that have them via the --base_cards_with_expansion option. Prior behavior would eliminate the base set if printing with the --base_cards_with_expansion option.