(Still more) Travis updates

Change-Id: Ie1962ce5e8725fbd12a90fa338a65b02c7783436