Added --rm to support python-keyring requirements. Pluss many other small things.