added skip_on_travis()
Merge branch 'master' of github.com:mllg/testthat