Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Moved bodytemp code to player.cpp and uncommented update_bodytemp
Long underwear no longer have storage
View kill stats in-game

Someone already wrote this disp_kills routine, but it was dead code;
I deduplicated the end-game kill stats screen and bound it to a key:
')' by default.
Proper terminal dimensions for death screen
Quick fix for windows size
Cannibalism-induced morale status shift fix
Merge pull request #210 from tasetase/quickfix

Quick fix for windows size
Merge pull request #211 from Catacstone/human_meat_morale

Cannibalism-induced morale status shift fix
Merge pull request #209 from iank/kill_screen

View kill stats in-game
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge pull request #212 from Shoes01/master

Bodytemp code moved to player.cpp
Fixed reinforced tag on fitted boots. You can now discard unwanted skillpoints at chargen
Add toolset to primitive crafts. Also made the needle use the knives toolgroup.
Fixed spelling error: received
Merge pull request #213 from fs0/master

spelling error in pldata.h
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
fixed conflict