How do we define diversity, and what do we want from it?