initial file upload support
more file upload refactoring
fixes to file uploader
merge file uploads, update gems