Merge pull request #94 from jessereynolds/89_entity_search_scopable_by_tags

89 entity search scopable by tags
apply fixes from @ali-graham's feedback on PR #94
Merge branch 'master' into 269_notification_rules_general_tags