Bugfixes for object description, combining inventory.

Signed-off-by: nppangband <nppangbanddev@verizon.net>