Travis: build config update

Brings over the latest config for Travis