What factors contributed to changes in African-American self-definition in the 1960’s?