Fixing bugs pointed out by @neumino
Merge branch 'slava_docs' of github.com:rethinkdb/rethinkdb into slava_docs