Add support for monster lifetimes
Merge branch 'mario_master' into nexcrarm
Patch from Mario