Update shoulda-matchers
Make some changes prompted by 'reek'