More Travis changes to get build to complete.