Updates for travis.ci