Revised sketch for issues #205, #206 and part of #153.
Add more metrics, tests for search-cross-checks. Close #205, close #206.
Address review comments.
Merge pull request #217 from graydon/bug-205-cross-check-wifi-against-cell

Sketch of fix for issue #205, general cross-checking / refinement of results