Fix bugs + add missing files
Merge branch 'michel_docs' of github.com:rethinkdb/rethinkdb into michel_docs