Gear updates.
Rearrange priority for getting the spell map for a spell to avoid conflicts.
Gear update
Add utility function to test for the existence of any of a provided set of
possible buffs, rather than having to manually test each one.
Further corrections for skill naming change.