make combine text configurable
fix test
Merge pull request #581 from metamx/combine-text

Make combine text input format configurable