Convert old should-syntax
Merge branch 'rspec-3' into factory-girl-4