added or gates all over the place
Merge branch 'master' of https://github.com/g-palmer/hashtags