Fix for #1894.
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Update for PR #1895.

Confirmed that no other issues were lurking by importing and running
against db dump from this morning.
Merge pull request #1895 from Stanford-Online/dca_new_working2

Fix for #1894. csv bombs for survey csv submission generation.