Fix make count when modifying ql2.proto

Review 2044 by @larkost
Closes #2965
treating csv files as utf-8 in `rethinkdb import`
Merge branch 'next' into daniel_buf_ref_datum_2