Updating Makefile to handle protobuf directory properly
Moved protobuf to 2.5.0