Changing nokogiri version
Merge remote-tracking branch 'origin/master'

Conflicts:
	svg_to_raphael.gemspec