Text tuning.  Started map-reduce/merge section.
Simplify merge, improve test logging, update paper with merge info
Added merge doco to paper