Cospeciation

This should take care of the two Travis failures.