A lot of tweaking to the file uploaders
Merge pull request #229 from funkedgeek/master

Uploader changes