Nuance distinction between map and flatMap

Hat tip to @hughfdjackson.
Merge remote-tracking branch 'origin/master'