misc
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
merchant confirmation page
Merge branch 'master' of https://github.com/kemccabe/betsy_rails