Lots of changes. Running version

with protobuf 2.4.1 and scalabuf 1.2.0