Updating to use the new teleport APIs
Merge branch 'master' of https://github.com/bclwhitaker/teleport-plugin
Preventing timeouts from freezing the browser