Instilling Diversity and Social Inclusion Practices in Teacher Education and Curriculum Development