Merge pull request #4 from wtsi-npg/devel

Devel
test for npg_daemon_control fixed to cope with presence of daemon plugins that are not defined in this package
Merge pull request #18 from mgcam/devel

mgcam devel to wtsi devel to fix a test