Refs #6344 - fixed email logic
Merge branch 'redistricting' of https://github.com/nysenate/Bluebird-CRM into redistricting