Polished Travis-CI handling