travis: merge improvements from slingshot travis.yml.in.

* travis.yml.in: Merge improvements from slingshot, and simplify.
* .travis.yml: Regenerate.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>