change to using 1.9 syntax in the Gemfile
remove the Ruby/JRuby check
tweak the ssh timeouts a little
Merge branch 'master' into features/docker-cpusets

Conflicts:
	Gemfile