fix minitest/autorun spew due to versioning with shoulda-matchers and 1.8.7
Merge branch 'gjmurakami-10gen-1.x-stable-shoulda-matchers' into 1.x-stable