Added filename to PSM id, needed for meta-files
Merge branch 'master' of https://github.com/percolator/percolator