Add rbx and jruby to the test matrix
Fix issues with Gemfile
Allow failures on 2.1.0
Merge branch 'master' into ducktrap

Conflicts:
	.travis.yml
	Gemfile