Remove socket timeouts and use right configuration to annotate

Conflicts:

	.travis.yml