Merge pull request #496 from Shopify/limit-test-time

Put a 60s limit on the test suite

Makefile

@@ -1,7 +1,7 @@
 default: fmt vet errcheck test
 
 test:
-	go test -v -race ./...
+	go test -v -timeout 60s -race ./...
 
 vet:
 	go vet ./...