Merge branch 'master' into 'master'

Master

Fixed archery to properly do on_hit, on_crit, and on_kill effects for ranged weapons and ammo.  It now properly handles single and multiple effects from a single weapon or ammo.