Migrate away from pkg_resources#236

barneysowood merged 2 commits intosaltstack:developsaltstack/pepper:developfrom

tacerus:importlibtacerus/pepper:importlibCopy head branch name to clipboard