Travis config changes (7 consolidated commits)