Implement distance-filter scaling
Implement stationaryAlarm to detect user stopped rather than passively calculating in onLocationChanged, since onLocationChanged won't fire until distanceFilter is surpassed
Oops, reset debugging code
Merge branch 'android'