Remove merchant type.

Conflicts:
	app/models/spree/supplier.rb