fixed up the migrations files and edited the migration of default and nils to inlcude everything it should
Merge remote-tracking branch 'origin' into umass_branch
fixing conflict in schema.rb
Conflicts:
	db/schema.rb
	log/development.log