merchant hack fixed.  all tests passing and spec harness passing
Merge branch 'refactoring_everything'
merged in solution for nil hack, unskipped test in BI