Refactored ItemStore
Fixed JSON encoding of Items
Began refactoring
Mostly finished refactoring
More refactoring
Pulled remote
Merged in weberc2_dev
Modified tests to (hopefully) pass on drone
Test still fails on drone, reverting changes.
Merged with master