Support singleton filenames.

Previously, track ids were assumed to be part of every filename. This
assumption does not hold for singleton tracks.
Merge pull request #399 from colin-scott/master

Support singleton filenames.