Change GPS/Wifi algorithm, add locationServices to sdef, fix bug in not killing location request, streamline processing