Merge pull request #24 from fiery-skippers-2014/model_dependencies

Model dependencies
Passing all model tests
Merge pull request #25 from fiery-skippers-2014/model_test

Passing all model tests
fixed bug in the user_completed_survey helper method