Choice and Diversity in Schooling