Refactored merchant revenue methods
Further merchant refactoring, total items sold method
little  more refactoring
edits to invoice.rb for calculating merchant items sold
fixed merge conflicts