Extract api access and message building from collector

Preparation for emiting more than just policies.
Conflate policies and announcements

Will make life quit different (and potentially more difficult) in the
recorder.
Fix collector spec by mocking API
Allow organisations to be empty.

@pbadenski
@robyoung