log and channel cleanup
Merge pull request #317 from mozilla/channels

log and channel cleanup