Callisto: Remove assumption about max gap between files.

Closes #543
Merge pull request #558 from segfaulthunter/callistofix

Callisto: Remove assumption about max gap between files.