#751 - skip logic parser throws error on names containing 'and' and 'or'
Merge pull request #196 from kobotoolbox/bugfixes

#751 - skip logic parser throws error on names containing 'and' and 'or'