Add artist to filename, if not already contained.

Reworked previous patch a bit...  Better?