Change old "should" syntax
Merge branch 'rspec-3' into rails-4