blah
Merge branch 'master' of katfs:~/katcp-git
Merge branch 'master' of katfs:~/katcp-git
Merge branch 'master' of katfs:~/katcp-git
err
Merge branch 'master' of katfs:~/katcp-git
Merge branch 'master' of katfs:~/katcp-git
Merge branch 'master' of katfs:~/katcp-git
Merge branch 'master' of katfs:~/katcp-git

Conflicts:
	tcpborphserver3/Makefile
Merge branch 'master' of katfs:~/katcp-git
Print beamformer detail too ...
Integrated selected additions made by David MacMahon
Bugfix: now unmap device
Bugfix: grab the environment variable
Bugfix for cmdline parser
Example use of argument retrieval
Attempt at endpoint logic to substitute for notices
test message sending
debug mainloop
include queue in build