Properly remove martial arts buffs when they expire or are invalid.
Alter descriptions slightly.
Fix display.
Small changes.
Fix bash and cut multipliers to actually do what they should.
Fix the fix for multiple stacks.
Revert "Fix the fix for multiple stacks."

This reverts commit 90487ad277ad95b3cc1027adbb2957be77cdc132.
Remove debug messages.
Change fix to be a more robust solution.
A-style, tweak, and slightly rebalance scent move to be less generous to mobs.
Merge branch 'rebalance-scent' into no-more-wacky-scents
Better. Faster. Stronger scent(tm)(tm).
Merge branch 'scent-erase' into no-more-wacky-scents

Conflicts:
	src/game.cpp
Prevent ant chambers being overwritten by tunnels.
Merge pull request #4681 from freezerbunny/fix-martial-arts-buffs

Properly remove martial arts buffs when they expire or are invalid.
Merge pull request #4713 from ianestrachan/fix-ant-chambers

Prevent ant chambers being overwritten by tunnels.
Improve implementation by reducing the number of rand calls and if-statements.
Disable scent debug again.
Merge branch 'pr/4704'
Revert "Merge branch 'pr/4704'"

This reverts commit dc9e3408ff32d5980c6ec267d7694948c2459eef, reversing
changes made to 946b9c3fd10d6aa72883720d1feed54fe6066922.