Merge pull request #58 from kobotoolbox/TP259

Tp259
not specifying option name
Merge pull request #59 from kobotoolbox/AutomaticOptionNameFix

not specifying option name
Reverting Quick fix in favor of a more thorough solution (that needs to be in the model, not the view)
Merge pull request #60 from kobotoolbox/RemovingQuickFix

Reverting Quick fix in favor of a more thorough solution
Fixes TP #259 but does not fix the import issue
lower casing 'and' and 'or'
Merge branch 'TP259' of github.com:kobotoolbox/dkobo into TP259