Merge pull request #786 from blackshadowshade/193_history_flags

Added die flagging mechanism
Merge branch 'master' into 829_ArrArr