Addition of Functor to encapsulate static and non-static class member JsonObject loading functions
-- May need moving of Functor definitions to new file?
Initial furniture.json file.
Remove c_ from colors, and use 'bgcolor' property for i_ colors.
Add a function to color.cpp that converts strings to i_xxxx colors.
Why was this a char? Everywhere it's used thinks it's an int.
Initial terrain.json.

Because it turns out I can't do one without doing the other, as they use the same set of flags.
Add type fields to furniture.json and terrain.json.
Fix some terrain that should have been ' but was accidentally ", and restored some comments.
Uppercase all the terrain flags.
Correct an overzealous find-and-replace.
Add some missing colors to color.cpp's color conversion functions.
Make furn_t and ter_t load from JSON, and use string flags instead of enum flags.
Changes Jabberwock's special attack frequency to 5.
A big steel mitten-thing to make your fists hit super hard!
Tweak.
Replace hideous function-that-returns-a-function-pointer declaration with a typedef.
Removed enum that no longer exists from ENUMS.md.
Tweak.
Merge branch 'upstream/master'

Conflicts:
	inventory.cpp
Brass knuckles, too!