Fix up ami to also dump enough info together with the files.

And get rid of the silly argument parsing. We just take the filename.
4 files changed