Faculty identities and the challenge of diversity : reflections on teaching in