Make sure we get logs & activities from the c2s
Merge branch 'master' of https://github.com/robottaway/warmachine