Move the meat of cauterization into player.cpp
Make knives capable of cauterization with a lighter.
Merge branch 'master' into knife-cauterize
Use the new item framework
Merge remote-tracking branch 'ethankaminski/knife-cauterize' into dda-master

Conflicts:
	data/changelog.txt