Switched out to use generated java for protos, to not require protoc.
Merge branch 'master' into testing

Conflicts:
	pom.xml
Added launcher and paths for blake, fixed fileid regex to work with new filenames.