Use RSpec 2.x
Fix deprecation warnings