Merge remote-tracking branch 'remotes/dda/pr/307' into dda-master
Fix rollmat crash, blade trap blade drops, added Brazier to benign list. Closes #331
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 #339 from veryinky/fix

fix kill count display
Merge pull request #340 from veryinky/patch-1
Merge pull request #342 from wito/weather-fixes

Weather fixes
Seperate out linker to allow substituting distcc for CXX.
Take zlevel into account when determining outsidedness.
Use normal outside cache for determining where to draw rain animation.
Allow rain animation to be disabled with an option.
Some const and interface cleanup in map.
Add etags make target.
Add etags and ctags targets to phony list.
Crafting seats require springs, pedals chunks.
Fix traps overwriting each other.
Made the message when you attempt to close the curtains from outside more informative.
Added new IF_NO_UNLOAD flag, used to prevent a weapon from being unloaded. (Charge rifles, LAWs, etc).
Merge pull request #351 from Voker57/fixes

Remove >< from possible inventory letters since they make items inaccessible