Add query-based user_tags.
Merge branch 'master' of https://github.com/indypy/todopyramid