Merge everything before "ts.gui" changes...

@nealstewart 
For catching bad selectors in the channel declarations: gui.channel(badselector, spirit);