Changed it so the location services popup only comes up if both gps AND
wifi are off, rather than if only one or the other are off.