demographics questions - review

[IanEisenberg]

@zenkavi make sure the questions are correct

[zenkavi]

pr #410 should fix this

[vsoch]

Could you please make the same adjustments to https://github.com/expfactory/expfactory-surveys/tree/master/demographics_survey