Badgerfish cleanup of OTU-mapping search context
Misc fixes for new supporting-files annotation

Includes Badgerfish rules throughout, and initial client-side testing.