Clearing up db errors and repairing seed file
Merge remote-tracking branch 'origin/master' into Indigo

Conflicts:
	app/models/survey.rb
Merge pull request #5 from danielleadams/Indigo

Indigo