move mpd onto channel
Merge branch 'v3-channels' of https://github.com/play/play into v3-channels

Conflicts:
	app/models/channel.rb
	config/initializers/play.rb