Merge branch 'tls' into origin-0.4-dev

Conflicts:
	.gitignore
	project.clj
	src/link/tcp.clj
fix conflicts