In/Out of combat improvement

[xpdota]

Currently, OP's InCombat inGameCombat is the only thing considered for being in or out of combat. This should be amended to work like this to reduce race conditions:

• If both OP and ACT say we're out of combat, and we were in combat before, combat has ended
• When OP or ACT changes from out-of-combat to in-combat, consider that a start of combat
• When OP changes from in-combat to out-of-combat, consider that an end of combat (but do not consider ACT, since that could have all sorts of funkiness with user settings)