update models: users, questions, answers, surveys, responses
Merge pull request #4 from danielleadams/Indigo

Indigo
fix user_id to id in Survey model
Merge branch 'master' of https://github.com/danielleadams/blinky
Clearing up db errors and repairing seed file
Merge remote-tracking branch 'origin/master' into Indigo

Conflicts:
	app/models/survey.rb