Test with ruby-head to make @tenderlove happy

Conflicts:
	.travis.yml