small test fixes
merchant test cleanup
merchant test cleanup
merge conflicts suck
coverage folders also suck
Merge branch 'master' of https://github.com/dalexj/sales_engine into herbswork
GIMME YOUR POWERRR
Merge branch 'master' of https://github.com/dalexj/sales_engine into herbswork
FUSION HAAAA
small code: check. hard tests: ....
Merge pull request #31 from dalexj/herbswork

Herbswork