Replaced a std::abs with ternary operator.

This gets things compiling on OS X.  (Dropping the std:: would be bad,
because we would not want to call some wrong stdlib.h abs by accident.)
Merge branch 'sam_2217' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next