Added non-jedi NPC evasion.
Various other NPC fixes.