Add support for TCP keepalive (-K option)
Add the -K option to help and man page
Merge branch 'keepalive'

Conflicts:
	src/netcore.c