added a bunch of affixes and included passive skills in dps calculation
Merge remote-tracking branch 'origin/master'