Make 'w' distinguish between two word categories.
Merge branch 'master' of https://github.com/kisielk/vigo