Describe waypoints (for #209)
	previous commit contains m2s / gpxexporter code changes for waypoint support