Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb

db/migrate/20101114011429_add_editor_preference_to_user.rb

@@ -0,0 +1,9 @@
+class AddEditorPreferenceToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :preferred_editor, :string
+  end
+
+  def self.down
+    remove_column :users, :preferred_editor
+  end
+end