Added units to basic combat view.

Combat now displays units lined up and highlights attacker and
defender.  Next up: damage display.