Merge pull request #1126 from dorkster/disable_equipslots

Allow items to disable equipment slots
Update disabled slots when returning an equipped item

Looks like I missed this when implementing the ability to disable
equipment slots.