Revert "Reverted unreviewed changes 904d2cc 6c67cf1 c76c80b6"

This reverts commit 71704bc1eb0dcb400801871888bbb37dfb719471.
updated ruby warnings
updated ruby warnings
Properly destroy the timeout (for ajax/distribution) for a namespace model
Merge pull request #481 from rethinkdb/michel_clear_timeout

Properly destroy the timeout (for ajax/distribution) for a namespace mod...
Copying JSON changes from www project
Merge branch 'next' into sam_457