Decouples from geomoment.

Moment & GeoMoment are no longer bundled into the distro file.
Merge branch 'patch-2'