Colms second updated merchant

Hi Steve, this is just a follow up to the last PR. I've added your suggestion about the current version of rails and I've made a few minor adjustments. The underscores where causing the text to display in italics so I've fixed this. Thanks for your feedback!