Made upload form for S3 autogenerated
Abstracted s3file, removed s3, and fixed a few bugs
Almost done with Local file storage