More changes to Characters/Items

Edited equip function to take equipment buffs into account.  Removed
inline from character functions.  Updated test driver.