5.2 Meta Damage Calc

- Uses proper average AP value
5.2 Meta Damage Calc

- Uses proper average AP value
- Moved the agi_modifier up the method, shouldn't have an impact here
but it's more professional at least.
5.2 melee+spell proc type

- Added a "melee_spell_damage" proc type for procs that deal spell
damage, but use the melee hit and crit tables.
Merge remote branch 'indz/master'
5.2 Stuff

- Reorganized Sub's Agi multiplier. Should have no impact on
calculations, but it's cleaner code.
- Check for Rupture in another location too.