Ssh less race

Another try at fixing the ssh races that cause Travis CI to fail.