Travis config changes (8 consolidated commits)