adds JS timeout option
Merge branch 'next' of github.com:rethinkdb/rethinkdb into js_timeout
adds JS source to JS timeout error message
Merge branch 'next' into js_timeout
adjusts js timeout error message in test
changes JS timeout reporting again to use narrower precision
fixes failed tests unrelated to JS timeouts
Merge branch 'next' into js_timeout
Merge branch 'next' into js_timeout
Merge branch 'next' into js_timeout
fix failing test after intended output change