Drop broken jruby-head test (breakage is in jruby-head on Travis AFAICS)
Merge branch 'master' into new_explainer

Conflicts:
	.travis.yml