6.0 Changes

- Updated combat script to use i620 pvp trinkets (with placeholder
scale values).
- Added 2 trinket procs.
- Cleaned up self.true_haste_mod initialization.