Equity and Efficiency in Computational Social Choice