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
add relationships for invoice and merchant
small code: check. hard tests: ....
Merge pull request #30 from dalexj/adam-branch

Adam branch
Merge pull request #31 from dalexj/herbswork

Herbswork
Merge pull request #32 from dalexj/alex

add relationships for invoice and merchant
fixed small typos
Merge pull request #33 from dalexj/alex

fixed small typos
used test_helper
add relationship test, fixed many typos in files using relationships
removed relationship tests from other test files
tested merchant relations, fixed bugs with merchant relations
all relationships tested except invoices: TODO for herbert
Merge pull request #34 from dalexj/alex

Alex