Refactoring the travis scripts to allow easier extension.

Can you `set -x` after?