clean up, about to add haversine
Merge branch 'development' of https://github.com/scoin/freegeo into development