Social justice and teacher education: re-defining the curriculum