Merging in the prototype survey and enabling the extra validation on Survey model
Merge pull request #138 from theodi/merging_prototype_survey

Needs merging for deploy tonight