Fixes to travis...

Ref: https://github.com/travis-ci/travis-ci/issues/2219.