moving things that rely on prompt state
Merge branch 'master' into gh-pages
scoping timeout function
Merge branch 'master' into gh-pages