jruby compatibility
add jruby to travis
jruby head fails
Merge branch 'master' into jruby

Conflicts:
	Gemfile
	Gemfile.lock