Merge branch 'hayesdavis' into v1_1

Conflicts:
	grackle.gemspec
	lib/grackle/client.rb