remove align & linediff add command-t plugin
Merge remote-tracking branch 'origin'