School diversity and social justice: policy and politics