Educating for diversity and social justice