WIP
Merge branch 'master' into zero-conf-tunnel

Conflicts:
	zeroconf/server.go
server and client using the new zeroconf API
tunnel now uses bonjour if no host is provided
Merge pull request #5 from dapplebeforedawn/zero-conf-tunnel

Zero conf tunnel