merge from master
a thought about detecting something not aware of gevent
updates for May 4 presentation
Merge branch 'github/master'

Conflicts:
	SLIDESHOW/02.md
change my homepage
change my homepage