Merge pull request #1 from cbarber/master

Not a trap
+ Check year when checking Survival records
Updated death messages with URL for the graveyard server.
Merge pull request #2 from ocelotpotpie/master

Death messages with graveyard info.
Merge remote-tracking branch 'upstream/master'