Michel 181 post1.12

Fix #181, Fix #170 

Cleaner PR than https://github.com/rethinkdb/docs/pull/187

@coffeemug -- I'm not sure it's better though. 
I tried to open a code review on code collaborator, but I fixed a few things in the merge of master, so the review is not really readable.