Fix style for zombie
Fix text
Merge branch 'michel_zombie' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next