Try to move things out of defines.h into more appropriate places, and likewise with util.c
Make dissolving monsters have a 'kill' sound effect, finishing off #1630 (thanks PowerWyrm).
Further reduce Paladin costs for PB7 CSW/CMW.  Thanks PowerWyrm for the suggestion.
Fix up tests
Remove character_icky from variable.c (since it's now in ui.c)
Fix targetting routines so that if a target is set on a particular grid where a monster is, instead o setting the target to the grid, we set it to the monster.  This closes #332.