Changed NPC bash formula to use Torven's

Songs with instrument regents will no longer require them to be played.

Fixed spell formula 110.
#npcloot will now add charged items with max charges automatically.
Re-ordered charm target checks so they make more sense and work better.
Merge pull request #27 from cavedude00/master

merge from cavedude00:master