newton found fixes
merge fix

Conflicts:
	drivers/python/rethinkdb/ast.py
	drivers/python/rethinkdb/errors.py
	drivers/python/rethinkdb/net.py