Fixes omission of DF from merch species in CA variant

previously DF was accidentally omitted!
corrects species code in WC_SDIMAX

Madrone was previously entered as MA, corrected to WA (species code
required by WC variant)
Fixes omission of DF from merch species in NC variant