Erase scent when we shift. Fix elevators.
Merge pull request #4685 from freezerbunny/scent-erase

Erase scent when we shift. Fix elevators.