Make descriptor.proto match Google's and re-compile descriptor.pb.rb

I'm potentially working on extensions and custom options, specifically custom field options, and this is potentially a pre-requisite, along with (I think) just being a good cleanup task.