Combatting Gerrymandering with Social Choice: the Design of Multi-member Districts