Updating to new combat skills proficiency system

Updating the npc templates to the new melee/aim proficiency system.