Redux: add -l and -s support to grep.

Conflicts:
	test/grep.js
Update tests to deal with potential ordering differences.