Teleporter a bit more sensible
Merge branch 'master' of github.com:tompudding/spacefight3000