Protobuf 2.6.0

Updated protocol buffers to 2.6.0. Don't know how to bottle things, so left that uncommented...!

Looks like 2.6.0 has all the same options as 2.5.0 so it was rather a simple change.
You mean, leave in the bottle scope? I.e. remove the comments?