Update RSpec config to support RSpec 2 and RSpec 3.
Merge pull request #1125 from thomas-holmes/support-rspec-3

Support rspec 3
Allows passing options through has_button? to has_selector?

This enables assertions on the presence of disabled buttons by doing:

    assert has_button?('Button text', :disabled => true)

in a similar way to:

    find_field("Disabled Checkbox", :disabled => true)
Merge pull request #1139 from carols10cents/has_button_options

Allows passing options through has_button? to has_selector?