Added MerchantTypes, and various associations between MerchantTypes, Categories, Merchants, and Countries