squashing bugs with various updates to music

[inversephase]

as far as I can tell these were uploaded to slack but have not made their way into the repos.

• story2-shouldfixbeep obsoletes story2
• killjaffar-usethisone obsoletes killjaffar
• the potion tracks need to be tested in a build.

[simondotm]

Looks good, I will rename the files in a mo