Merge pull request #87 from cyberjunk/master

Fix broken half-revert of touchatk.kod
Conveyance

Utility Spell (never counts toward level progression) that sends any
stack of number items that can be stored in a vault to your closest
personal vault. Can't be used on money.
Death Rift spell id #

Had to change this because I chose the wrong number and it conflicts
with Set.
Revert "Merge pull request #55 from MorbusM59/patch-23"

This reverts commit b4c1d1b8f9b3f98a8a37f9cba54ad32e8d5cb407, reversing
changes made to 26a61b6d692b4eb330365a2a916a692af23dd740.
Revert "Merge pull request #56 from MorbusM59/patch-24"

This reverts commit a13612b3f2383395fccab126a9627eff30fec7bb, reversing
changes made to b4c1d1b8f9b3f98a8a37f9cba54ad32e8d5cb407.
Bait Radius Restriction

Defaults to 16. Implemented as a property so that it can be modified
live.
Merge pull request #90 from M59Gar/baitfix

Bait Radius Restriction
Merge branch 'shadowrift' of git://github.com/M59Gar/Meridian59 into M59Gar-shadowrift

Conflicts:
	kod/include/blakston.khd -- RESOLVED
Merge branch 'M59Gar-shadowrift'
Merge branch 'setloadout' of git://github.com/M59Gar/Meridian59 into M59Gar-setloadout

Conflicts:
	kod/include/blakston.khd -- RESOLVED
Minimum Swings for Imp Setting

WC requires 75 swings before you even have a chance to imp. This setting
allows that to change.
Revert "Merge pull request #82 from MorbusM59/Various-Fixes"

This reverts commit 099f83d69a02605d8a20b3f4a086db5edc0b657f, reversing
changes made to 73043007f8c334e03c0aa97852646fe47c88be11.

Conflicts:
	kod/object/passive/spell/persench/touchatk.kod -- RESOLVED
Merge branch 'WCboring' of git://github.com/M59Gar/Meridian59 into M59Gar-WCboring

Conflicts:
	kod/util/settings.kod -- RESOLVED