EXTTerm now stores external/display basis data
remove EXTTerm -drawWithSpacing, now handled by a controller instead of the model
Merge remote-tracking branch 'origin'
draw the differential highlight with the right shift