Made a bunch of lines shorter.
Removed mock cache (that had somehow been merged in) and fixed some silly compilation problems.
Merge branch 'sam_no_ptr_bag' of github.com:rethinkdb/rethinkdb into sam_no_ptr_bag