Improved travis config