make descriptor.proto match Google's, add Google::Protobuf to Messages in descriptors, recompile descriptor.proto
fix for ruby-protoc
Merge pull request #6 from codekitchen/master

merge codekitchen master
Merge pull request #22 from centzy/custom_options

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