Edit survey page now always says "edit"
Merge branch 'master' of https://github.com/JSConnolly/survey_gorilla