Merge pull request #548 from Sleaker/master

More Inventory work
get rid of Magic numbers in windows/inventories.

Signed-off-by: Nick Minkler <sleaker@gmail.com>