altered the get_upgrades_ep function

should provide better ranking where other procs from same trinket but other ilvl dont influence the calculation (e.g talisman of bloodlust)
Merge remote-tracking branch 'upstream/master'

merge from dazer
fix for ruptureless combat cycle
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.