Better support for travis-ci.org