Merge pull request #21 from scopatz/master

Code of Conduct and Diversity Statements
Contacted johnny lin. Moved that entry into the 'sent' list.
annc from md
Merge branch 'master' of github.com:scipy/scipy-conference