How to Fix Gerrymandering and Voter Disenfranchisement