Merge pull request #370 from wolfmanjm/upstreamedge

update kossel config
make M114 output match Marlin