Support for Slot Swapping

My changes are in comments, so no actual code change. Uncomment to
enable them. I'm sure you know that.

Skills that move attacker end combat
(future note: but will resume abilities and combat if another card is
swapped into its place.)
Skills that move defender will end combat or target new card if target
slot is empty or filled with a follower, respectively.