Reformatting
Working CSV read - need tests now
Collapse some ifs in gpx.c