Fixed more npc templates for the new proficiency system.

Also fixed an error with skill levels below 12 with combat actions.