Update Travis CI

A few updates to get Travis working properly again.