Giffgaff UK (mvno) and O2 UK settings updated