pulled out duplicated code and simplified uploaders
Merge pull request #163 from biola/roz_uploaders_consolidation

pulled out duplicated code and simplified uploaders