lan discovery works
Merge branch 'unstable' of github.com:hattwj/rainmaker into unstable