Add trap arming timer even if player is incombat.
Update ConfuseMovementGenerator for Spells with SPELL_AURA_MOD_CONFUSE and BasePoints == 1.

* Will effect Scatter Shot and Blind movement
* http://www.warcraftmovies.com/movieview.php?id=58495 at time 10:45