Only test against Ruby 2.1.2 in .travis.yml
Merge branch 'divergence' of github.com:workplacesystems/rack-client into divergence

Conflicts:
	.travis.yml