Merge pull request #1 from CrazyPants/master

Merge branch from CP Master
Merge pull request #2 from CrazyPants/master

One more...
Fixed horses being unkillable in Cauldron (being tamed with no owner)
Merge pull request #16 from MikeLydeamore/master

Fix Fallen Knights being tamed without an owner.