Updates to work with Travis CI.