Level Restart on Boss or Player Death

On top of having the level restart, this also pulls in some changes that cleanup the project and the world a bit (see 192addb commit message).