'first commit on Monday
'
Merge branch 'master' of https://github.com/DSynergy/sales_engine
Merged shit hopefully...
 Finished generic tests (merchant,invoice et al)