Merge pull request #264 from csmith/master

Rename getChannels to getChannelNames.
Add getChannels and use it everywhere.
Remove getChannelNames.

Turns out there's no real use for it.