Damage to do vs. ATK modification

Updated to move ATK modifiers to a new variable to prevent accidental
stacking (warpath on top of concentration for example).  Some cards
updated with new display to show damage to do versus ATK value.