Migration mods

Conflicts:

	db/schema.rb