Upgrade to protobuf 2.6.0
Merge pull request #3 from jplock/jp-protobuf-2.6.0

Upgrade to protobuf 2.6.0