#303 include original file name for archive_entry

[Terry O'Neill]

When archive file types (zip, etc.) are normalised the xena files for the contents are currently given a name of the form:

<timestamp>-archive_entry<number><name of entry>-<hex number>

e.g. 20131113163907030-archive_entry2929743853375786069manifest.xml-78081fcc

As the file name is essentially used to make it easy to manually see what files are what it would make more sense to also include the file name of the original archive as part of the resulting file name. Some rules could be added in to shorten this if the name would be unreasonably long.

On a similar note it may be worth changing the output of files with spaces as this is currently output with %20 in the file names.