Remove a couple more gendered pronouns
Cleanup trailing whitespace
Merge pull request #2772 from sferik/gender_neutral_pronouns

Remove a couple more gendered pronouns