Make GPS Distance measurement default to miles
Finish fixing up the Gps distance issue and resolve conflicts