Update files for election demo
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Forgot files...
Merge branch 'next' into sam_fix_osx_build