pull in latest changes from upstream

- license changed from Apache to BSD
  https://code.google.com/p/protobuf/source/detail?spec=svn502&r=50
- Support for C-style comments in editors/proto.vim
  https://code.google.com/p/protobuf/source/detail?spec=svn502&r=398