Merge pull request #359 from wolfmanjm/upstreamedge

Fix positive trim values for delta M666, cleanup various header files
Fix issues with using Mxx to play/pause SD files
properly cleanup if sd print was paused and abort is issued