Reorganized Travis-CI config