Don't use mercury for non-rich-text
Fix mercury tests
Merge pull request #441 from sharetribe/mercury-fixes

Don't use mercury for non-rich-text