fixing importing a single file, as well as adding options for csv files: --no-header, --field-names, and --delimiter
Connection port is now converted to an integer and raises an exception if it could not.

Conflicts:

	drivers/python/rethinkdb/net.py
adds port conversion test
fixes test
Preliminary 1.7.1 release notes
fixes some errors with JS backtraces
Fix docs for insert with the returnVals flag in JS. ROTS by @wmrowan
index.html should not be cached
Add a query parameter to the ajax request to reql_docs.json
Fix comment according to @atnnn review
Convert seconds to milliseconds for setTimeout + do not emit two errors when the handshake fails
fixed without
Merge branch 'v1.7.x' of github.com:rethinkdb/rethinkdb into v1.7.x
Javascript driver: bump version to 1.7.0-1
Init script: wait for instance to stop

Issue #1115
Makefiles: do not use variables if they are undefined
Cherry pick branch 1115 into v1.7.x

Review 707 by @mlucy
Add the backup scripts to the osx uninstall script

Review 708 by @tryneus
Closes #1123
Do not use /dev/stdin in install.mk

Review 710 by @tryneus
Closes #710
Remove rdb_migrate script

Review 710 by @tryneus