modified merchant/location relationship and refactored location spec