* added matches to cavern spawn list. Now you at least have a chance of escape.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mapitemsdef.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
advanced inventory: [e]xamine
* Fixed cavern canned food generation.
Merge remote-tracking branch 'upstream/master'
Clean future weather on cleanup
Eating skill books on accident makes me SICP
Merge misc fixes.