Moved the teleport stuff into a parent class
Merge branch 'master' of github.com:tompudding/spacefight3000