pkg_resources.safe_names should support underscores

I'm having a problem maintaining the latest package versions via puppet (which runs "pip freeze"). This stems from not allowing underscores in the safe_name function. "pip freeze" returns "package-name", when in fact it should return "package_name". "pip freeze" retrieves the packages from pkg_resources.working_set.