fixed options parsing unit tests and added more
fixes #1287
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Restored < operator to `counted_t`.
Fixed typos and clarified some changes in NOTES
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
fixing some problems with import error reporting, performance, and interruption; import now requires --force to import a table with rows with identical primary keys
fixing an error in import when reading json files and tweaking performance slightly
Added description for #1252, which was merged in for 1.8.0
More tweaks to NOTES
Merge remote-tracking branch 'origin/atnnn/notes' into v1.8.x

Conflicts:
	NOTES
Merge remote-tracking branch 'on' into HEAD
Get docs validation to pass
Merge remote-tracking branch 'origin/v1.8.x' into HEAD
Update NOTES

Reviewed OTS by @coffeemug
Merge remote-tracking branch 'origin/atnnn/notes' into HEAD