cleanup; update to latest protobuf
Merge pull request #21 from mreiferson/cleanup_21

cleanup and compilation