Initial move of item jsons from raw/items to json/items
Addition of "GENERIC" and "INSTRUMENT" tags, instrument is unused other than to make sure it doesn't freak out when trying to load.
Added "colordef" as an ignored tag, and set up init to use file_finder to get json paths.
Added load_X(JsonObject &jo) functions to item_factory and alternative functions to those that would otherwise use catajson objects.
Removed section where Item factory tries to load stuff
Reverted addition of file_finder call and manually added the additional filepaths that are needed to be loaded. Using file_finder messes with recipes a bit by making them load before skills that they need.
Cleaned up Item_factory, removing unused functions:
fixed missing type tag
recipe load: Add debugmsg whining for missing books
Merge remote branch 'origin/pr/3460' into frackingjsonbooks
Load recipes -after- items
Cleanup style of nosuchbook carping
Merge 'we'll take items.json from here and put it into there'
Merge remote branch 'origin/master' into frackingjsonbooks
Merge branch 'pr/3466'
Merge pull request #9 from CleverRaven/master

merge from mainstream