Setup.py tweaks, plus rename from underscores to dashes.