Added geographic distance calculations to site module.
Fixed conflicts