rake and other tests fixed
Merge branch 'adding-data-in' of https://github.com/gregnar/sales_engine into adding-data-in