Pull for issue #306

Displays friendly when applicable, enemy always, and breaks down totals
for easier viewing.