Fix rspec deprecation warnings, bump watirspec.