Fix zeroconf test on Travis, simplifications
Update generated files
Remove obsolete test.h
Move away from removed/deprecated lunchbox API
Merge branch 'master' of https://github.com/eile/Collage
Merge pull request #56 from eile/master

Move away from removed/deprecated lunchbox API