Travis tests: minor reorganization.

Move things in a more logical order in the Travis config file, cf. #249.