Mill-drill emits M6 despite noM6 specified #696

Description of bug:

What did you try (include command-line arguments):

1. Configure drillmill=true
2. Specify nom6=true
3. Generate GCODE using pcb2gcode --config laser.cfg --output-dir gcode

What happened:

The M6 GCODE is present in the output.
Fragment of the output:

...
G01 F2000.00000 (Feedrate)
G00 Z1.00000 (Retract to tool change height)
T1
M5        (Spindle stop.)
G04 P1.00000
(MSG, Change tool bit to drill size 0.08000mm)
M6        (Tool change.)
M0        (Temporary machine stop.)
M3        (Spindle on clockwise.)
G04 P1.00000
G00 Z1.00000
...

What did you expect to happen:

No M6 GCODE is present in teh output.

pcb2gcode version (run pcb2gcode --version to see this):

2.5.0
Git commit:
Boost: 108700
Gerbv: 2.10.0
Geos: Not installed

pcb2gcode-bug.zip