master: Fixed issue with running external protoc; Added auto-patching of protobuf 2.4.1 for Mac; Fixed issue with different output directories for .java files.