Merge "Add -r option when removing egg-info files/folders"