Merge pull request #257 from dorkster/fixes

Beef up damage numbers for traps