Added death and battles ending.
Still need to add ice and fire attacks, but I *think* everything should
work now, I haven't been able to test yet.
Also merged in remote commits