Change map/reduce to map-reduce; fixes #475
Merge branch 'issue-475-mapreduce'

Conflicts:
	0-about-rethinkdb/faq.md