Added upload directory option to s3
Merge pull request #62 from Joshua-Anderson/s3-uploaddir

Added upload directory option to s3