Update diversity-statement

Moved expected behavior section to code of conduct; minor content edits.