Separated phases of matter from materials
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Fixed typo
Fixed crafting of drinks
Fixed bracket issue caused by merge conflict
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Change master recipe data structure - organized by category now
Remove now-unused craft_cat member from recipe struct
Minor cleanup (linebreaks, remove unused variable)
Let recipes be non-autolearned

First pass at making learned vs. automatic recipes. Also fixes a bug where you could use the search function to gain access to noncraftable recipes (i.e., recipes meant only for disassembly).
Fix recipe filter
Push recipes out to JSON

Yeesh, this was gnarly. picojson is annoying to work with (especially if you're doing error-checking), and that was a lot of recipes. Perl recipe2json script available upon request, assuming I haven't deleted it.
Added formatted writes for Map Generation.

Provides a formatted_set_terrain method. Also added helper.cpp to the
cbp file.
Added back the rotate call I that got removed

Derr.
Acid rain causes pain not injury
roadmap now paper|null
Changed default viewmorale key to v
Removed kitchen units from garage spawn list
Merge pull request #456 from veryinky/viewmoralekeyfix

Changed default viewmorale key to v
Merge pull request #454 from veryinky/acidfix

Acid rain causes pain not injury