Refactor stop words and use more separators.
Merge pull request #83 from marketboomer/richard

TO STABLE: Refactor stop words and use more separators.