Fixes to accomodate for breaking merchello changes, not complete
Merge pull request #600 from koswesley/newbranch

Fixes to accomodate for breaking merchello changes, not complete
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0