Moved inventory to generic inventories, removed RoomInventory.

Tests currently fail, should be fixed to next commit
Removed tests for the class that was removed.