Merge pull request #29 from betatim/wordlist-refining

Wordlist refining
Merge remote-tracking branch 'origin/master'

Sorry for screwing up the history