Cleanup implementation of the script
Cleanup implementation of the script

This is a partial commit of a larger piece of work that actually introduced
problems. I'm going to submit this piece and then try to figure out what part of
the remainder is causing the tests to fail.

dkprice/vim-easygrep,dkprice/vim-easygrep