Updated list of Organizers and Nominees. Resolved merge conflicts from gh-pages.

Conflicts:
	nominees.md
	organizers.md

Conflicts:
	nominees.md
Merge branch 'master' of github.com:NCEAS/open-science-codefest