Merge remote-tracking branch 'dda/pr/434' into dda-master
Cleanup some trailing whitespace.
Display player feat morale boosts
Pickling/canning - using glass bottles, sheet metal, food, and fire ... and tools

This commit has three recipes as a starter.  Basic idea is to let the
player CRAFT a TOOL that is a sealed jar containing a comestible.  Then
the tool is activated, turning it into a glass bottle containing
spoilable food inside.  Until activated, the sealed jar is preserved
forever.
To add recipes, add a non-reversible RECIPE("jar_something",
CC_FOOD,......     then add two itypes  TOOL("jar_something", ......
&iuse::dejar, ....)  and FOOD("something",...........).  The iuse::dejar
function will transform the sealed jar into the container with the food.
note: probably won't handle paper wrappers.
Merge remote-tracking branch 'dda/master' into dda-master
Merge Display player feat morale boosts into dda-master
Only display Masochist morale condition if there is a masochism bonus.
Merge Pickling/canning into dda-master
Changed pickled to canned since I'm an inveterate pedant.
Merge remote-tracking branch 'upstream/master'