moved location calc down on death_calc so that it correctly sets death age based on dangerous locations
Merge branch 'master' of https://github.com/zedwarth/deathclock