Gemification and path fixes
Return from the dead: merchant_test.rb
Merge remote-tracking branch 'origin/master'