Edit test/Makefile.am to try to reduce merge/rebase conflicts
Edit test/Makefile.am to try to reduce merge/rebase conflicts

libmapper/libmapper,malloch/libmapper,malloch/libmapper,libmapper/libmapper,malloch/libmapper,malloch/libmapper,malloch/libmapper,libmapper/libmapper,libmapper/libmapper,libmapper/libmapper,malloch/libmapper,libmapper/libmapper