-re-added unmerged changes

-re-added my most recent changes to Health and Companion Behavior
Scripts
Merge pull request #24 from jpmeenagh/Johns-13-re-add-playtest-changes2

-re-added unmerged changes