disable M204- change acceleration for now as it needs to be put in the block queue and slic3r abuses it.
Merge pull request #242 from wolfmanjm/upstreamedge

Upstreamedge
Merge remote-tracking branch 'upstream/edge' into edge