Merge remote-tracking branch 'origin/master' into jeffandersen/new-interface

Conflicts:
	lib/client.js
	lib/v1/auth_settings.js
	lib/v1/route.js
	test/v1/auth_settings.js