Merge gigantic json shuffle.

Conflicts:
	data/json/items/tools.json
Kill dead code and restyle some stuff.
Merge branch 'pr/6'

Conflicts:
	data/json/items/tools.json