@nstraub's changes from skip-logic-tests in a single commit
Merge pull request #129 from kobotoolbox/skip-logic-tests-unified

@nstraub's changes from skip-logic-tests in a single commit