Clean up Equipment

Sacrificed types for eliminating redundancy.  Also added the Equippable
Interface.