Wsa token filter

Here we go again, re-post of https://github.com/bamboo/boo/pull/73