Update RSpec

This change updates to the first GA version of RSpec 3
Merge branch 'update-rspec'