Merging via intersection for hybrids.
Merge pull request #333 from matsen/327-hybrid-intersect

Merging via intersection for hybrids, and lots of noisy errors if sequence file and jplace are different.