Merge pull request #72 from wooky/master

Fixed players getting teleported into walls. Closes #71
Fixed players jumping onto an elevator teleporting them

Fixes #73. Hacky nasty implementation. /shoots self