Updated E2

Name changed and teleporting to players if they're inside a tardis will
now land you outside the tardis itself rather than trying to go into the
interior.