Speaker selector

The speaker-selector branch is closed, but it doesn't look like this branch is currently in master, so I'm resubmitting the pull request with an update to resolve #687 .