Incorporate geek feminism org

[ammeep]

👋

As discussed here https://github.com/github/opencodeofconduct.github.io/pull/1

I had a go at incorporating the explicit definitions of harassment found here http://geekfeminism.wikia.com/wiki/Community_anti-harassment/Policy

One thing I really like about the GF code of conduct is that there is a secondary document which allows the definition and formation of an Anti Abuse Team. I have included that also.

This is ready for 👀 and feedback cc @bkeepers @caniszczyk

[shiftkey]

_ at the start to bring back the italics

[shiftkey]

I think the second URL here should be this repo, which links to:

[sharing this with you](http://todogroup.org/opencodeofconduct/)

[shiftkey]

@ammeep this is great! Found a couple of minor things to update, but the rest is ✨!

[papaben]

From our* community

[caniszczyk]

Sorry for the delay on this one, I totally agree we should incorporate these changes. I'll work on incorporating these changes, just need to refactor them a bit so they can merge cleanly, I'll make sure to keep the original authorship.

[caniszczyk]

Hey @ammeep, I did my best merging in some of your suggestions with this commit and keeping the attribution towards you:
6b9d181

I really want to strive to keep everything into one file instead of having two files. Please look it over and let me know if it's OK.

Also, I updated some of the language based on the updated Django code of conduct which was much better than it was before: https://www.djangoproject.com/conduct/ (it should meet the standards outlined here: http://geekfeminism.wikia.com/wiki/Code_of_conduct_evaluations)

Any other progress should be made in pull requests that are easier to merge cleanly into master from now on :)