Add -l and -s support to grep.
Update tests to deal with potential ordering differences.
Merge pull request #116 from idearat/master

Add -l and -s support to grep.