Merge branch 'master' into denney-new-user-form

Conflicts:
	db/schema.rb

db/migrate/20130423231937_alter_user_roles.rb

@@ -0,0 +1,9 @@
+class AlterUserRoles < ActiveRecord::Migration
+  def change
+    rename_table :user_roles, :user_role_joins
+    change_table :user_role_joins do |t|
+      t.rename :role, :role_id
+      t.change :role_id, :integer
+    end
+  end
+end

db/migrate/20130423233228_add_roles.rb

@@ -0,0 +1,8 @@
+class AddRoles < ActiveRecord::Migration
+  def change
+    create_table(:roles) do |t|
+      t.string :role
+      t.timestamps
+    end
+  end
+end

db/migrate/20130424005701_alter_user.rb

@@ -0,0 +1,5 @@
+class AlterUser < ActiveRecord::Migration
+  def change
+    remove_column :users, :user_role_id
+  end
+end