Now running with Ruby 2.0
Merge branch 'update'

Conflicts:
	lib/grit/ruby1.9.rb
Bump version to 2.5.1