Using build tags in order to test timeout related code changes to goon

Conflicts:
	timeout.go