Merge pull request #22 from ckelman/charlie

Made the search find many more results.  It's better this way I think.