Attending to tags attached to a channel in fetching channel's contents
Gathering all recipes from all channels under new scheme
Now editing channels specially
Moved recipe yield for channels up into User model
Listing all users and channels for Steve and Max
Moved typedname for tags from controller to model
taggable list now shows type; list of channels has "Associated Tags" header
Removed "add" link when user/channel already followed
Relabelled column header of channels table
Merge branch 'hotfixes' into Channels
Added channel selection to sharing dialog
Interface for selecting channel now works
Recipe successfully added to channel
Popup notification of channel add now working
Merge branch 'refs/heads/hotfixes' into Channels

Conflicts:
	app/controllers/invitations_controller.rb
	app/models/user.rb
Fixed friends/channels search to be case-insensitive
Allowing channel match to get any channel, not just those subscribed to
Merge branch 'refs/heads/hotfixes' into Channels
new channel takes any primary tag by default
Channel and user getting successfully saved