Fixing broken saving

All thanks to better error reporting!
Fixes

Naleen nip has a price
No more Merc abilities overlapping
Fighting the machina should reset fight count.
Fixed unequipping the bra.
Fixed a jade thing.
Fixed riding the naleen not letting get off under certain circumstances.
Always show item value, properly disable held item buttons in the players inventory using stat tooltips.
Bug and typo fixes

Converted some shop stuff to check for NPC class instead of name string.
Merge remote-tracking branch 'upstream/master'