Merge branch 'travis-rbx'

.travis.yml

@@ -15,7 +15,6 @@ rvm:
   - 2.1.2
   - 2.2.0
   - jruby-19mode
-  - rbx-2
   - 2.3.0
 gemfile:
   - Gemfile
@@ -42,8 +41,6 @@ matrix:
       gemfile: gemfiles/Gemfile.ruby1.9.3
     - rvm: jruby-19mode
       gemfile: gemfiles/Gemfile.ruby1.9.3
-    - rvm: rbx-2
-      gemfile: gemfiles/Gemfile.ruby1.9.3
     - rvm: 2.3.0
       gemfile: gemfiles/Gemfile.ruby1.9.3
     - env: DB=sqlite USE_SQLITE_EXT=1

README.md

@@ -9,7 +9,7 @@ _Please note that this README is for the current `HEAD` and may document feature
 Compatibility
 -------------
 
-* Supports multiple Ruby versions: Ruby 1.9.3, 2.x, JRuby, and Rubinius.
+* Supports multiple Ruby versions: Ruby 1.9.3, 2.x, and JRuby.
 * Supports multiple databases: MySQL, PostgreSQL, SQLite, and MongoDB (1.7.0 and higher).
 * Supports Rails 3, 4, and 5. If you need to use it with Rails 2 please see the `rails2` branch (no longer maintained, limited feature set).
 * Works very well outside of Rails, you just need to install either the `json` (for MRI) or `json_pure` (for JRuby) gem.