Updated support for travis-ci