Spelling correction (supplimental to supplemental) in overmapp.cc
create_starting_npcs will not generate starting npcs if the no_npc.txt file exists.
Removed old data/nonpc.txt and no_npc.txt files. Added npc.txt you can set in the npc.txt file which npcs you want to spawn. The starting one or random spawn ones. All defaults are set to not spawn them.
small comment problem fixed
Added fix for npc spawning on top of other npc. It now searches in a spiral pattern for a free spot (a game->is_empty spot).
Added missing a few npctalk switch cases.
Add far-sighted as a trait, take penalties with no reading glasses

Added the Far-Sighted trait. If you're far-sighted and have no reading glasses on, you're unable to read and take a melee accuracy penalty.
Make Far-Sighted also apply a penalty to electronics/tailoring crafting

Added electronics/tailoring crafting penalties to far-sighted, after GlyphGryph suggested it.
Only crafting is penalized (not disassembly), because making things is more fiddly than taking them apart.
Only electronics/tailoring are affected (tailoring less so) because they seem the most reliant on fine detail vision.
fix kill count display
crafting recipes for seat, muffler, crank.
Merge remote-tracking branch 'remotes/dda/pr/307' into dda-master

Conflicts:
	itype.h
	itypedef.cpp
	mapitemsdef.cpp
Merge pull request #328 from jbfink/spelling-fix

Spelling correction (supplimental to supplemental) in overmapp.cc
Fix rollmat crash, blade trap blade drops, added Brazier to benign list. Closes #331
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Merge pull request #329 from Soyweiser/master

Stopped npc's from spawning. Using a new npc.txt file.
Actually fixed the rollmat crash this time. Ctrl-Z is a fickle friend.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Merge pull request #332 from Soyweiser/NPC_fixes

Npc spawning on top of each other fixed
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Merge pull request #334 from ethankaminski/trait-farsighted

Add Far-Sighted trait