Move task instrumentation to this lib
Update .travis.yml