Only trigger TravisCI timeout workaround when really on TravisCI
Merge pull request #240 from fabiang/travis-timeout

Only trigger TravisCI timeout workaround when really on TravisCI