pull changes from wtsi devel to wtsi master - mainly changes to deamons