Diversity and Equality: The Changing Framework of Freedom in Canada