Disable gevent
Merge branch 'master' into no-gevent
Fixes #4