Update for testing with travis-ci.