Tool json

This *should* all be correct. One thing to note is that some tools do use techniques (particularly melee weapons), although I should have properly converted all those.

Second copy of the pull request because there was an accidental push that caused Github to mark the first one as merged.