Untabified shift.eForth
Resolved merge conflicts