init.d tweaks.
Merge branch 'next' of https://github.com/rethinkdb/rethinkdb into next