Tested adding/removing inventory mgmt
Fixing merge conflicts between NewSchema and Master
Merge pull request #4 from travisbloom/NewSchema

Tested adding/removing inventory mgmt