Merge pull request #1 from evildmp/master

Get other attendees
Added my GitHub account
Merge pull request #2 from evildmp/master

Get even more attendees
Merge branch 'master' into amend-my-name

Conflicts:
	attendees_and_learners.rst
Clean up trailing space.
Merge branch 'amend-my-name' into explore-conflict

Upstream doesn't contain my email address or github.