Get rid of commented out code
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop