Incorporate new preamble from dove
Re-title and edit surprise and well-actually

Re-title and edit the sections on feigning surprise and
well-actually to better clarify the actual principles,
incorporating changes from dove
Wordsmith 2nd paragraph in -ism principle

Suggestions from dove
Wordsmith apology section

Suggestions from dove
Rewrite last section

Update the "What happens if" section to make it clear that public
callouts in electronic media will not end well, and that public
callouts in person will fare better if you focus on the statement
or action, not the person making it.  The goal here is to convey
the difference between, e.g. "I found that statement very sexist"
vs "You are being sexist".  The former will result in far less
defensiveness.
Add a copy of dove's document for reference only

Add a copy of the draft dove submitted, for reference only,
so it's in the same place while this is being worked on
More tweaks to surprise and end section

- Remove failed attempt to use "ignorance" literally and replace with
  wording from principles.txt
- Clarify that seciton about "surprise" applies regardless of _intent_,
  since it's about how the recipient is likely to feel.
- Add stronger wording reminding people that the EC is never the wrong
  answer: While we want to encourage "grown up" communication, it should
  not be the case that people feel they can't be in SIPB if they can't
  confront people about their behavior.  This should result on a balance
  on the spectrum between "tattling" and people feeling fully empowered to
  challenge others on their violations of these principles.
Clarify-no-really the part about talking to the EC.

The goal here is to say:

a) Here are some principles
b) Here are how to deal with someone violating these principles.
c) Talking to the EC is not the wrong answer, and is orthogonal to
  (a) and (b)
Merge branch 'master' of https://github.com/jdreed/sipb-code-of-conduct into jdreed-master

Conflicts:
	code-of-conduct.txt