Development, Diversity, and Conflict in the Sociology of Science