KF-83
fixes KF-94 and remnants of KF-93
Merge pull request #30 from kobotoolbox/KF-94

Kf 94