Change gender/sex to gender/gender_identity
Merge pull request #37 from wufm/change-gender-sex-to-gender-binary

Merge in Marc's proposal as approved on 9/19