Merge pull request #6 from troygnichols/master

Normalize models
Rename ItemInStock#in_stock to #quantity

Also add back in the migration for the items_in_stock table, got left
out somehow
Merge branch 'master' of github.com:ocsoftware/chs_inventory