added some updates to merchant tut
removing a mention of @order setup
Merge pull request #504 from lau03229/colms-updated-merchant

Colms updated merchant