Ctrl+tab should switch tab on Firefox 31 - #2959
Adds the machine name and UUID to the "Server ready" message
Take deleted or conflicted names into account
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Add tests for pseudotypes to json tests

Over the shoulder from @Tryneus.
Merge branch 'next' of https://github.com/rethinkdb/rethinkdb into next