Fix and re-add jaunter

Messed with the teleporting, should work
Merge pull request #534 from wild-billy/organs

Fix and re-add jaunter