Fix syntax for r.js + add description for timeout
Merge pull request #252 from rethinkdb/michel_210_js_timeout

Fix syntax for r.js + add description for timeout