rollback shoulda-matchers
Merge pull request #2004 from Daxter/bugfix/rollback-mocha

Rollback mocha / shoulda-matchers