Inventory, weapons

Adds inventory support and preliminary work for weapons and other items
within the game.  This commit also includes minor bug fixes.