cville/conduct — pull request #2 by csheldonhess (2014-09-24 01:09:58+00:00)
Title: Added socioeconomic status and tried to fix a comma splice

Not really a substantive change; the list in the long version was hard to parse. (It is hard to parse in the Geek Feminism version, too; I really should go in and fix that for them.) Also, we added "socioeconomic status" to the short version, so I added it to the long version. Thanks!