adapt to recent Gatherer changes

Closes #86

This pull request also adds Underscore as a dependency, which simplifies much of the code.