flatMap overloads

- migrate mapPair to use actual merge instead of reimplementing it
- deprecate mergeMap
Merge pull request #1560 from benjchristensen/flatMap-mergeMap

flatMap overloads