Include both automatic and manual laps in HRM output
Include (undocumented) HRM [LapNames] section
Remove abandoned @todo comment (#10)