Upgrade RBX in Travis. Drop tests for Rails 3.1.x
Bump rubinius to 2.2.1 in travis
Merge branch 'master' into cleanups