Resample SFX to dodge a bug in SDL_ConvertAudio
more cleanups
Merge branch 'master' into SDL2