Bump nokogiri
Fix nokogiri regression
Merge pull request #1 from Shopify/bump_nokogiri

Bump nokogiri
bump nokogiri more
Merge branch 'master' into pull_upstream_master

Conflicts:
	opensrs.gemspec
Pick some changes from upstream