cville/conduct — pull request #4 by btaitelb (2014-09-24 12:44:28+00:00)
Title: adds missing categories

Clarifies that it's not acceptable to do things like tell blonde jokes or make fun at the expense of a specific ethnicity. I also added "academic status" since I've seen some academic bullying at meetups.