Wottop/activation key expansion

I think this should actually be the combined set of the product IDs on the key, as well as the product IDs on the consumer. IMO the product ID on key should be *additional* things. A unit test to cover this would be a good idea.