Present two versions of upload_file function

Modify upload_file/5 to strip any path information when determining
the key value for storing the file. Add upload_file/6 to allow the key
to be specified independently of the file name.