better timeout handling in js
Merge branch 'master' of github.com:rolandshoemaker/luther