Rename sort to collate. I felt that collate was a more accurate term.
- Update changelog through 8f10ba8a854df9a3f678c363af0a52f168285c8e
- tweak wording
Merge git://github.com/logstash/logstash