Added option to kill player instead of teleporting to spawn.

This is Rourke's pull #23 since his git is fighting him. All the changes I mentioned in the previous pull have been squashed.