More tweaks, trying to silence setup.py warnings.

Only tested the "sdist" command, so far. No idea if the package is installable.