Merge pull request #567 from atlasapi/bt-channels-remove-old-channel-group-channels

Remove channels from removed channel groups
Must remove channel groups from channels

Removing channels from channel groups does not remove from the
channel, so we must remove the channel group from the channel
Merge branch 'bt-channel-group-remove-group' into stage