Clean up gps.conf a bit

Change-Id: Iea602ee0770552deb0b548bcad2dee955518f242