fixup! 23462042
include fixup from Bitbucket HEAD
include fixup from eyeD3==0.7.4 as fixup2
tidyup fixup plugin args
allow user to specific naming templates in fixup plugin