Merge branch 'abci_proof' into develop

Makefile

@@ -4,6 +4,10 @@ all: protoc install test
 
 NOVENDOR = go list github.com/tendermint/abci/... | grep -v /vendor/
 
+install-protoc:
+	# Download: https://github.com/google/protobuf/releases
+	go get github.com/golang/protobuf/protoc-gen-go
+
 protoc:
 	@ protoc --go_out=plugins=grpc:. types/*.proto
 
@@ -13,8 +17,10 @@ install:
 build:
 	@ go build -i github.com/tendermint/abci/cmd/...
 
-test:
-	@ go test `${NOVENDOR}`
+# test.sh requires that we run the installed cmds, must not be out of date
+test: install
+	find . -name test.sock -exec rm {} \;
+	@ go test -p 1 `${NOVENDOR}`
 	@ bash tests/test.sh
 
 fmt: