Refactored merchants.rb. Lines are as short as they can be without renaming methods at this point.
Merge branch 'master' of github.com:Diasporism/sales_engine