Implement AND/OR in trait search

Rewrote most of the searching logic, as well as the result display templates (both html and csv)
Addressed a number of outstanding concerns