Better fix for the wrong sndfile.h (#324): put modplug includes first.
Revert "Include modplug headers in the explicit libmodplug directory (#324)."

This reverts commit 6a3b983fcb13cb3dbf9ffcadbb12bd3e3f9e95b2.
Merge branch 'v1.1'

Conflicts:
	CMakeLists.txt