close #46 Factor UploaderPlusMixin
close #47: Upload fails when filename already exists