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
Changes the `rcheck` and `rfail` series of macros to use the same argument order
Add tests for pseudotypes to json tests

Over the shoulder from @Tryneus.
Compress the debug symbols after building an RPM

Review 2126 by @larkost
Merge branch 'vexocide/3114' into next
merge of #3112 r.http() https access not working on OSX
naming change
Merge branch 'larkost/3112-osx-https-broken' of https://github.com/rethinkdb/rethinkdb into larkost/3112-osx-https-broken