Changed non-hostile attacks to not call SetEncounter.
Clean up of Non-Hostile vs Hostile combat actions.
Merge pull request #18 from nilsbrummond/heals-keep-encounters-active

Changes to non-hostile actions to not use SetEncounter