Merge branch 'master' into v1.14
Merge branch 'v1.14' of github.com:rethinkdb/docs into v1.14
Replace tab with spaces
Merge pull request #459 from rethinkdb/michel_indent

Replace tabs with spaces