Minor refactor of search and stop words.
Merge pull request #72 from marketboomer/richard

Minor refactor of search and stop words.