Use test-runner.sh instead of homegrown test.sh
Whitespace tweak
Tweak .travis.yml