update with changes from Production branch

db/migrate/20110407034539_add_social_to_channels.rb

@@ -0,0 +1,15 @@
+class AddSocialToChannels < ActiveRecord::Migration
+  def self.up
+    add_column :channels, :social, :boolean, :default => 0
+    add_column :channels, :slug, :string
+
+    add_index :channels, :slug
+  end
+
+  def self.down
+    remove_index :channels, :slug
+
+    remove_column :channels, :slug
+    remove_column :channels, :social
+  end
+end