Overwritten files when duplicate file names uploaded but local file removed

Amending PR from https://github.com/dataferret (props for the bulk of it) - therefore supersedes https://github.com/deliciousbrains/wp-amazon-s3-and-cloudfront/pull/41

Resolves #36